Skip to content

Commit 801a293

Browse files
Merge branch 'main' into dependabot/github_actions/actions/setup-node-6
2 parents c2a0c8c + 4a697d6 commit 801a293

File tree

8 files changed

+142
-57
lines changed

8 files changed

+142
-57
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2323

2424
- name: Setup Node.js ${{ matrix.node-version }}
2525
uses: actions/setup-node@v6
@@ -41,7 +41,7 @@ jobs:
4141

4242
steps:
4343
- name: Checkout repository
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v6
4545

4646
- name: Setup Node.js
4747
uses: actions/setup-node@v6

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
5454
steps:
5555
- name: Checkout repository
56-
uses: actions/checkout@v4
56+
uses: actions/checkout@v6
5757

5858
# Add any setup steps before running the `github/codeql-action/init` action.
5959
# This includes steps like installing compilers or runtimes (`actions/setup-node`

.github/workflows/instant-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Trigger Propagation
19-
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3
19+
uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697 # v3
2020
with:
2121
token: ${{ secrets.FARM_DISPATCH_TOKEN }}
2222
repository: hyperpolymath/.git-private-farm

.github/workflows/jekyll-gh-pages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v6
3131
- name: Setup Pages
3232
uses: actions/configure-pages@v5
3333
- name: Build with Jekyll
@@ -36,7 +36,7 @@ jobs:
3636
source: ./
3737
destination: ./_site
3838
- name: Upload artifact
39-
uses: actions/upload-pages-artifact@v3
39+
uses: actions/upload-pages-artifact@v4
4040

4141
# Deployment job
4242
deploy:

.github/workflows/rsr-antipattern.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
antipattern-check:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020

2121
- name: Check for TypeScript
2222
run: |

.github/workflows/ts-blocker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
check:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v4
7+
- uses: actions/checkout@v6
88
- name: Block new TypeScript/JavaScript
99
run: |
1010
NEW_TS=$(git diff --name-only --diff-filter=A HEAD~1 2>/dev/null | grep -E '\.(ts|tsx)$' | grep -v '\.gen\.' || true)

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
"rescript": ">=11.0.0"
3131
},
3232
"devDependencies": {
33-
"@rescript/react": "^0.13.0",
33+
"@rescript/react": "^0.14.0",
3434
"react": "^18.2.0",
3535
"react-dom": "^18.2.0",
36-
"rescript": "^11.1.0"
36+
"rescript": "^12.0.2"
3737
}
3838
}

0 commit comments

Comments
 (0)