Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-node-if-needed/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
id: check-node
shell: bash
run: |
if command -v node >/dev/null 2>&1; then
if node --version 2>/dev/null | grep -q "v${{ inputs.node_version }}"; then
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pre-existing check would resolve true if the installed version of node was different to what was specified via inputs.node_version. Harden it a bit by verifying that the actual installed version of node reports something that gives a strong hint at being the right version. This should be compatible with specifying additional constraints on the version - i.e. minor and patch levels.

I wonder if there's a cleaner way to do this - i.e. I'd suspect setup-node has some built-in version checker, but since action was only recently by @Reinis-FRP I'm assuming there was some blocker there.

echo "installed=true" >> "$GITHUB_OUTPUT"
else
echo "installed=false" >> "$GITHUB_OUTPUT"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- "master"
env:
NODE_VERSION: 20
NODE_VERSION: 22
jobs:
# Multiple jobs depend on having EVM and SVM artifacts available, so we upload them first in separate jobs.
upload-svm-artifacts:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
permissions:
contents: write
env:
NODE_VERSION: "20.x"
NODE_VERSION: "22"
EVM_ARTIFACTS_PATHS: |
artifacts
cache
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "git+https://github.com/across-protocol/across-smart-contracts-v2.git"
},
"engines": {
"node": ">=16.18.0"
"node": ">=22.16.0"
},
"files": [
"/contracts/**/*.sol",
Expand Down Expand Up @@ -78,7 +78,6 @@
"devDependencies": {
"@codama/nodes-from-anchor": "^1.2.0",
"@codama/renderers-js": "^1.2.14",
"@consensys/linea-sdk": "^0.1.6",
"@matterlabs/hardhat-zksync-deploy": "^0.6.3",
"@matterlabs/hardhat-zksync-solc": "^1.4.0",
"@matterlabs/hardhat-zksync-upgradable": "^0.1.0",
Expand Down
205 changes: 0 additions & 205 deletions scripts/claimLineaMessages.ts

This file was deleted.

Loading
Loading