Skip to content

Commit 128844a

Browse files
authored
Merge branch 'cmu-delphi:dev' into ananya-joshi/teamupdate
2 parents bc23f01 + 12b498a commit 128844a

File tree

9 files changed

+71
-71
lines changed

9 files changed

+71
-71
lines changed

.github/workflows/blog.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
run:
1515
shell: bash -l {0}
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 3
2020
- uses: mamba-org/provision-with-micromamba@v16
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
Rscript ./dependencies.R
3939
- name: Restore Blogdown Cache
40-
uses: actions/[email protected].1
40+
uses: actions/[email protected].2
4141
with:
4242
path: |
4343
./blogdown
@@ -55,4 +55,4 @@ jobs:
5555
name: blog
5656
path: |
5757
./content/blog
58-
./static/blog
58+
./static/blog

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
9+
- uses: actions/checkout@v4
1010
with:
1111
# submodules: true # Fetch Hugo themes (true OR recursive)
1212
fetch-depth: 3 # Fetch all history for .GitInfo and .Lastmod
1313

14-
- uses: actions/setup-node@v3
14+
- uses: actions/setup-node@v4
1515
with:
1616
node-version: 16
17-
- uses: actions/[email protected].1
17+
- uses: actions/[email protected].2
1818
with:
1919
path: ~/.npm
2020
key: ${{ runner.os }}-node3-${{ hashFiles('**/package-lock.json') }}
@@ -38,7 +38,7 @@ jobs:
3838
runs-on: ubuntu-latest
3939
steps:
4040
- name: Check out code
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4
4242
- name: Login to GitHub Container Registry
4343
uses: docker/login-action@v3
4444
with:

.github/workflows/create_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
with:
1616
ref: main
1717
ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }}
@@ -32,7 +32,7 @@ jobs:
3232
base: main
3333
title: Release ${{ steps.version.outputs.next_tag }}
3434
labels: chore
35-
# reviewers:
35+
# reviewers:
3636
assignees: melange396
3737
body: |
3838
Releasing ${{ steps.version.outputs.next_tag }}.

.github/workflows/dependabot-assignments.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ permissions:
77
jobs:
88
dependabot:
99
runs-on: ubuntu-latest
10-
env:
11-
GH_TOKEN: ${{ secrets.CMU_DELPHI_AUTOMATION_MACHINE_DEPENDABOT_PAT }}
10+
env:
11+
GH_TOKEN: ${{ secrets.CMU_DELPHI_AUTOMATION_MACHINE_DEPENDABOT_PAT }}
1212
if: ${{ github.actor == 'dependabot[bot]' }}
1313
steps:
1414
- name: Assign team to PR
1515
run: gh pr edit "$PR_URL" --add-reviewer "cmu-delphi/code-reviewers"
1616
env:
17-
PR_URL: ${{github.event.pull_request.html_url}}
17+
PR_URL: ${{github.event.pull_request.html_url}}

.github/workflows/release_main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Check out code
20-
uses: actions/checkout@v3
21-
- uses: actions/setup-node@v3
20+
uses: actions/checkout@v4
21+
- uses: actions/setup-node@v4
2222
with:
2323
node-version: 16
2424
- name: Extract version
@@ -42,12 +42,12 @@ jobs:
4242
runs-on: ubuntu-latest
4343
steps:
4444
- name: Check out code
45-
uses: actions/checkout@v3
46-
- uses: actions/setup-node@v3
45+
uses: actions/checkout@v4
46+
- uses: actions/setup-node@v4
4747
with:
4848
node-version: 16
4949
- name: Cache Node.js modules
50-
uses: actions/[email protected].1
50+
uses: actions/[email protected].2
5151
with:
5252
path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
5353
key: ${{ runner.OS }}-node2-${{ hashFiles('**/package-lock.json') }}
@@ -68,7 +68,7 @@ jobs:
6868
runs-on: ubuntu-latest
6969
steps:
7070
- name: Check out code
71-
uses: actions/checkout@v3
71+
uses: actions/checkout@v4
7272
with:
7373
ref: dev
7474
ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }}

.prettierrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module.exports = {
22
printWidth: 120,
33
semi: true,
44
trailingComma: "es5",
5-
5+
plugins: ["prettier-plugin-go-template"],
66
overrides: [
77
{
88
files: ["*.html"],

package-lock.json

Lines changed: 45 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"private": true,
55
"dependencies": {
66
"@fortawesome/fontawesome-free": "^6.4.2",
7-
"highlight.js": "^11.8.0",
8-
"katex": "^0.16.8",
9-
"uikit": "^3.17.0",
7+
"highlight.js": "^11.9.0",
8+
"katex": "^0.16.9",
9+
"uikit": "^3.17.8",
1010
"www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v3.2.9/www-covidcast-3.2.9.tgz",
1111
"www-covidcast-classic": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.6.7/www-covidcast-classic-2.6.7.tgz",
1212
"www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.3/www-epivis-2.0.3.tgz"
@@ -15,9 +15,9 @@
1515
"hugo-bin": "^0.115.0",
1616
"husky": "^8.0.3",
1717
"lint-staged": "^15.0.2",
18-
"prettier": "^2.8.8",
19-
"prettier-plugin-go-template": "^0.0.13",
20-
"rimraf": "^5.0.1",
18+
"prettier": "^3.0.3",
19+
"prettier-plugin-go-template": "^0.0.15",
20+
"rimraf": "^5.0.5",
2121
"shx": "^0.3.4"
2222
},
2323
"files": [

themes/delphi/layouts/_default/baseof.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<!-- Default base template. Other templates define the "main" portion in this template -->
33
<html lang="{{ $.Site.LanguageCode | default "en" }}">
44
<head>

0 commit comments

Comments
 (0)