Skip to content

Commit

Permalink
chore(ci): fix pnpm version
Browse files Browse the repository at this point in the history
  • Loading branch information
sideninja committed Oct 10, 2024
1 parent 58ef5e2 commit 1fd1a2d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/check-sol-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ jobs:
version:
nightly-9dbfb2f1115466b28f2697e158131f90df6b2590
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 8
run_install: false
run: make install-tools
- name: Build artifacts
run: make all
- name: Check for changes
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/soltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: foundry-rs/foundry-toolchain@v1
- uses: pnpm/action-setup@v4
with:
package_json_file: contracts/core/package.json
- name: Install pnpm
run: make install-tools
working-directory: contracts
- run: pnpm install
- name: Check fmt
run: forge fmt --check
Expand All @@ -35,9 +35,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: foundry-rs/foundry-toolchain@v1
- uses: pnpm/action-setup@v2
with:
package_json_file: contracts/avs/package.json
- name: Install pnpm
run: make install-tools
working-directory: contracts
- run: pnpm install
- name: Check fmt
run: forge fmt --check
Expand Down
5 changes: 4 additions & 1 deletion contracts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ version: ## Print tool versions.
@forge --version
@abigen --version


.PHONY: install-tools
install-tools:
@which npm > /dev/null || echo "npm not installed, see https://nodejs.org/en/download/package-manager"
@which pnpm > /dev/null || (echo "pnpm not installed, installing..."; npm install -g pnpm@8.14.0)

.PHONY: install-deps
install-deps: ## Install dependencies.
Expand Down

0 comments on commit 1fd1a2d

Please sign in to comment.