From c3a0857a4f513d383c93f3e90a32acfafe9e84c6 Mon Sep 17 00:00:00 2001 From: Mikhail <16622558+mmv08@users.noreply.github.com> Date: Tue, 14 May 2024 11:15:09 +0200 Subject: [PATCH] fix github actions --- .github/workflows/certora_4337.yml | 7 ++- .github/workflows/ci.yml | 10 +++-- .github/workflows/ci_4337.yml | 25 ++++++++--- .github/workflows/ci_4337_gas_metering.yml | 10 +++-- .github/workflows/ci_4337_local_bundler.yml | 12 +++-- .../workflows/ci_4337_upstream_bundler.yml | 10 ++++- .github/workflows/ci_passkey.yml | 44 +++++++++++++------ .github/workflows/ci_passkey_example.yml | 8 +++- 8 files changed, 92 insertions(+), 34 deletions(-) diff --git a/.github/workflows/certora_4337.yml b/.github/workflows/certora_4337.yml index d30ad49f4..894b8d24f 100644 --- a/.github/workflows/certora_4337.yml +++ b/.github/workflows/certora_4337.yml @@ -23,6 +23,11 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 + - name: Install python uses: actions/setup-python@v4 with: { python-version: 3.11 } @@ -37,7 +42,7 @@ jobs: sudo mv solc-static-linux /usr/local/bin/solc8.23 - name: Install dependencies - run: pnpm install + run: pnpm install - name: Verify rule ${{ matrix.rule }} working-directory: ./modules/4337 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce442acd5..5a2678333 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,10 +6,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 - uses: actions/setup-node@v4 with: node-version: 20.x - cache: npm + cache: pnpm cache-dependency-path: package-lock.json - - run: npm ci - - run: npm run fmt:global-check + - run: pnpm install + - run: pnpm run fmt:global-check diff --git a/.github/workflows/ci_4337.yml b/.github/workflows/ci_4337.yml index df4b06f04..fdf77e2ba 100644 --- a/.github/workflows/ci_4337.yml +++ b/.github/workflows/ci_4337.yml @@ -9,13 +9,17 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 - uses: actions/setup-node@v4 with: node-version: 20.x - cache: npm + cache: pnpm cache-dependency-path: package-lock.json - run: | - npm ci + pnpm install npm run coverage -w modules/4337 - name: Coveralls uses: coverallsapp/github-action@master @@ -26,24 +30,33 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 - uses: actions/setup-node@v4 with: node-version: 20.x - cache: npm + cache: pnpm cache-dependency-path: package-lock.json - run: | - npm ci + pnpm install npm run test:4337 -w modules/4337 lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 - uses: actions/setup-node@v4 with: node-version: 20.x - cache: npm + cache: pnpm cache-dependency-path: package-lock.json - run: | - npm ci + pnpm install npm run lint -w modules/4337 npm run fmt:check -w modules/4337 diff --git a/.github/workflows/ci_4337_gas_metering.yml b/.github/workflows/ci_4337_gas_metering.yml index c4b5a541f..c99a6e5c3 100644 --- a/.github/workflows/ci_4337_gas_metering.yml +++ b/.github/workflows/ci_4337_gas_metering.yml @@ -10,6 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 - uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} @@ -17,6 +21,6 @@ jobs: - name: Install dependencies run: pnpm install - run: | - npm run fmt:check -w examples/4337-gas-metering - npm run lint -w examples/4337-gas-metering - npm run build -w examples/4337-gas-metering + pnpm run --filter "@safe-global/safe-modules-example-4337-gas-metering" fmt:check + pnpm run --filter "@safe-global/safe-modules-example-4337-gas-metering" lint + pnpm run --filter "@safe-global/safe-modules-example-4337-gas-metering" build diff --git a/.github/workflows/ci_4337_local_bundler.yml b/.github/workflows/ci_4337_local_bundler.yml index 62e4dddf1..242aca3c6 100644 --- a/.github/workflows/ci_4337_local_bundler.yml +++ b/.github/workflows/ci_4337_local_bundler.yml @@ -9,11 +9,17 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 + - uses: actions/setup-node@v4 with: node-version: 20.x - cache: npm + cache: pnpm cache-dependency-path: package-lock.json - run: | - npm ci - npm run lint -w packages/4337-local-bundler + pnpm install + pnpm run --filter "@safe-global/safe-4337-local-bundler" lint diff --git a/.github/workflows/ci_4337_upstream_bundler.yml b/.github/workflows/ci_4337_upstream_bundler.yml index 4f7f857e8..6e861974f 100644 --- a/.github/workflows/ci_4337_upstream_bundler.yml +++ b/.github/workflows/ci_4337_upstream_bundler.yml @@ -15,12 +15,18 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 + - uses: actions/setup-node@v4 with: node-version: 20.x - cache: npm + cache: pnpm cache-dependency-path: package-lock.json - run: | - npm ci + pnpm install npm run test:4337:upstream -w modules/4337 npm run test:4337:upstream -w modules/passkey diff --git a/.github/workflows/ci_passkey.yml b/.github/workflows/ci_passkey.yml index 05968a442..72157d2ad 100644 --- a/.github/workflows/ci_passkey.yml +++ b/.github/workflows/ci_passkey.yml @@ -9,14 +9,18 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 - uses: actions/setup-node@v4 with: node-version: 20.x - cache: npm + cache: pnpm cache-dependency-path: package-lock.json - run: | - npm ci - npm run coverage -w modules/passkey + pnpm install + pnpm run --filter "@safe-global/safe-passkey" coverage - uses: coverallsapp/github-action@master with: path-to-lcov: modules/passkey/coverage/lcov.info @@ -25,37 +29,49 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 - uses: actions/setup-node@v4 with: node-version: 20.x - cache: npm + cache: pnpm cache-dependency-path: package-lock.json - run: | - npm ci - npm run lint -w modules/passkey - npm run fmt:check -w modules/passkey - npm run build -w modules/passkey + pnpm install + pnpm run --filter "@safe-global/safe-passkey" lint -w + pnpm run --filter "@safe-global/safe-passkey" fmt:check + pnpm run --filter "@safe-global/safe-passkey" build e2e: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 - uses: actions/setup-node@v4 with: node-version: 20.x - cache: npm + cache: pnpm cache-dependency-path: package-lock.json - run: | - npm ci - npm run test:4337 -w modules/passkey + pnpm install + pnpm run --filter "@safe-global/safe-passkey" test:4337 benchmark: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 - uses: actions/setup-node@v4 with: node-version: 20.x - cache: npm + cache: pnpm cache-dependency-path: package-lock.json - run: | - npm ci - npm run bench -w modules/passkey + pnpm install + pnpm run run --filter "@safe-global/safe-passkey" bench diff --git a/.github/workflows/ci_passkey_example.yml b/.github/workflows/ci_passkey_example.yml index 57ac18d63..e3ad466e5 100644 --- a/.github/workflows/ci_passkey_example.yml +++ b/.github/workflows/ci_passkey_example.yml @@ -11,13 +11,17 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install pnpm + uses: pnpm/action-setup@v3 + with: + version: 9 - uses: actions/setup-node@v4 with: node-version: 20.x - cache: npm + cache: pnpm cache-dependency-path: package-lock.json - run: | - npm ci + pnpm install npm run lint -w examples/4337-passkeys npm run build -w examples/4337-passkeys env: