Skip to content

Commit f09de2e

Browse files
Merge branch 'main' into hermes/actions-cache-hardening-20260512
Resolve PR #90 cache-removal conflicts after pnpm migration. Keep shared Actions cache removal, preserve pnpm workflow updates, and fix nested pnpm enable steps.
2 parents 1ddaf84 + bd52ae6 commit f09de2e

9 files changed

Lines changed: 5929 additions & 5014 deletions

File tree

.github/actions/install/action.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@ runs:
44
using: composite
55

66
steps:
7+
- name: Install pnpm
8+
uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
9+
with:
10+
run_install: false
11+
712
- name: Install node
813
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
914
with:
10-
node-version: 18
11-
15+
node-version: 22.13
1216
- name: Install Foundry
1317
uses: foundry-rs/foundry-toolchain@c7450ba673e133f5ee30098b3b54f444d3a2ca2d # v1
1418

1519
- name: Install dependencies
16-
run: yarn install --frozen-lockfile
20+
run: pnpm install --frozen-lockfile
1721
shell: bash

.github/workflows/formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
- uses: ./.github/actions/install
2222

2323
- name: Run Linter
24-
run: yarn lint
24+
run: pnpm run lint

.github/workflows/foundry.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: ./.github/actions/install
2525

2626
- name: Build contracts via IR & check sizes
27-
run: yarn build:forge --force --sizes # don't use compilation cache
27+
run: pnpm run build:forge --force --sizes # don't use compilation cache
2828

2929
build-no-ir:
3030
name: Compilation (without IR)
@@ -39,7 +39,7 @@ jobs:
3939
- uses: ./.github/actions/install
4040

4141
- name: Build contracts without IR
42-
run: yarn build:forge
42+
run: pnpm run build:forge
4343
env:
4444
FOUNDRY_PROFILE: test
4545

@@ -74,7 +74,7 @@ jobs:
7474
- uses: ./.github/actions/install
7575

7676
- name: Run tests in ${{ matrix.type }} mode
77-
run: yarn test:forge -vvv
77+
run: pnpm run test:forge -vvv
7878
env:
7979
FOUNDRY_FUZZ_RUNS: ${{ matrix.fuzz-runs }}
8080
FOUNDRY_FUZZ_MAX_TEST_REJECTS: ${{ matrix.max-test-rejects }}

.github/workflows/hardhat.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: ./.github/actions/install
2525

2626
- name: Build contracts
27-
run: yarn build:hardhat --force # don't use compilation cache
27+
run: pnpm run build:hardhat --force # don't use compilation cache
2828

2929
- name: Run hardhat tests
30-
run: yarn test:hardhat
30+
run: pnpm run test:hardhat

.github/workflows/npm-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
- uses: ./.github/actions/install
2020

2121
- name: Build package
22-
run: yarn build:pkg
22+
run: pnpm run build:pkg
2323

2424
- name: Publish to npm
2525
run: |
2626
cp LICENSE README.md package.json dist/
2727
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
28-
yarn publish dist --access public --ignore-scripts
28+
pnpm run publish dist --access public --ignore-scripts

package.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"prepare": "husky install && forge install",
44
"build:forge": "forge build",
55
"build:hardhat": "hardhat compile",
6-
"build:blue": "yarn --cwd lib/morpho-blue/ build:forge",
7-
"build:irm": "yarn --cwd lib/morpho-blue-irm/ build:forge",
6+
"build:blue": "pnpm --dir lib/morpho-blue/ run build:forge",
7+
"build:irm": "pnpm --dir lib/morpho-blue-irm/ run build:forge",
88
"typecheck": "tsc --noEmit",
9-
"test:forge": "yarn build:blue && FOUNDRY_PROFILE=test forge test",
10-
"test:hardhat": "yarn build:blue && yarn build:irm && hardhat test",
11-
"lint": "yarn lint:forge && yarn lint:ts",
9+
"test:forge": "pnpm run build:blue && FOUNDRY_PROFILE=test forge test",
10+
"test:hardhat": "pnpm run build:blue && pnpm run build:irm && hardhat test",
11+
"lint": "pnpm run lint:forge && pnpm run lint:ts",
1212
"lint:ts": "prettier --check test/hardhat",
1313
"lint:forge": "forge fmt --check",
14-
"lint:fix": "yarn lint:forge:fix && yarn lint:ts:fix",
14+
"lint:fix": "pnpm run lint:forge:fix && pnpm run lint:ts:fix",
1515
"lint:ts:fix": "prettier --write test/hardhat",
1616
"lint:forge:fix": "forge fmt",
1717
"clean": "hardhat clean && forge clean"
@@ -72,5 +72,9 @@
7272
"^\\."
7373
],
7474
"importOrderSeparation": true
75+
},
76+
"packageManager": "pnpm@11.0.9",
77+
"engines": {
78+
"node": ">=22.13.0"
7579
}
7680
}

0 commit comments

Comments
 (0)