From 5ffe6ad22e6e28f4dcd38cb54bf58476f07cf8cb Mon Sep 17 00:00:00 2001 From: Tom Meagher Date: Wed, 19 Apr 2023 17:52:34 -0400 Subject: [PATCH] ci: workflow variable updates --- .github/actions/setup/action.yml | 7 ++++--- .github/workflows/bench.yml | 5 +---- .github/workflows/main.yml | 16 ---------------- .github/workflows/release-canary.yml | 10 ++++------ .github/workflows/release.yml | 11 +++++------ .github/workflows/size.yml | 3 --- .github/workflows/snapshot.yml | 10 ++++------ package.json | 2 +- 8 files changed, 19 insertions(+), 45 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 4e72680085..1c8590f152 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -3,12 +3,13 @@ runs: using: "composite" steps: - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 - - name: Set up Node ${{ matrix.node-version }} + - name: Set up pnpm + uses: pnpm/action-setup@v2 + - name: Set up node@18 uses: actions/setup-node@v3 with: cache: 'pnpm' - node-version: ${{ matrix.node-version }} + node-version: 18 - name: Cache pnpm uses: actions/cache@v3 with: diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 829009d214..7abc489244 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -10,9 +10,6 @@ jobs: install: name: Install runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18] steps: - uses: actions/checkout@v3 - name: Setup @@ -24,7 +21,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [18] + transport-mode: ['http', 'webSocket'] steps: - uses: actions/checkout@v3 - name: Setup diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6d5b77659e..bbc84162c0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,9 +13,6 @@ jobs: install: name: Install runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18] steps: - uses: actions/checkout@v3 - name: Setup @@ -25,9 +22,6 @@ jobs: name: Lint needs: install runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18] steps: - uses: actions/checkout@v3 - name: Setup @@ -54,9 +48,6 @@ jobs: name: Build needs: lint runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18] steps: - uses: actions/checkout@v3 - name: Setup @@ -70,7 +61,6 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [18] shard: [1, 2, 3] total-shards: [3] transport-mode: ['http', 'webSocket'] @@ -105,9 +95,6 @@ jobs: name: Test Types needs: lint runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18] steps: - uses: actions/checkout@v3 - name: Setup @@ -121,9 +108,6 @@ jobs: name: Benchmark needs: lint runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18] steps: - uses: actions/checkout@v3 - name: Setup diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-canary.yml index 89627ab9f2..137cd92558 100644 --- a/.github/workflows/release-canary.yml +++ b/.github/workflows/release-canary.yml @@ -13,19 +13,17 @@ jobs: build_and_publish: name: Release (canary) runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18] steps: - uses: actions/checkout@v3 with: fetch-depth: 0 - - uses: pnpm/action-setup@v2 - - name: Set up Node ${{ matrix.node-version }} + - name: Set up pnpm + uses: pnpm/action-setup@v2 + - name: Set up node@${{ vars.NODE_VERSION }} uses: actions/setup-node@v3 with: cache: 'pnpm' - node-version: ${{ matrix.node-version }} + node-version: ${{ vars.NODE_VERSION }} registry-url: 'https://registry.npmjs.org' - name: Install Dependencies run: pnpm i --ignore-scripts diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b235e38c3a..1711e3472f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,21 +9,20 @@ jobs: release: name: Release runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18] steps: - uses: actions/checkout@v3 with: # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits fetch-depth: 0 - - uses: pnpm/action-setup@v2 - - name: Set up Node ${{ matrix.node-version }} + - name: Set up pnpm + uses: pnpm/action-setup@v2 + - name: Set up node@${{ vars.NODE_VERSION }} uses: actions/setup-node@v3 with: cache: 'pnpm' - node-version: ${{ matrix.node-version }} + node-version: ${{ vars.NODE_VERSION }} + registry-url: 'https://registry.npmjs.org' - name: Install Dependencies run: pnpm i --ignore-scripts diff --git a/.github/workflows/size.yml b/.github/workflows/size.yml index aa7025663b..44644f1cf0 100644 --- a/.github/workflows/size.yml +++ b/.github/workflows/size.yml @@ -6,9 +6,6 @@ jobs: build: name: Compressed Size runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18] steps: - uses: actions/checkout@v3 - name: Setup diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index e88de321a5..9f299cc3b9 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -6,9 +6,6 @@ jobs: release: name: Publish Snapshot runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18] steps: - uses: actions/checkout@v3 with: @@ -16,12 +13,13 @@ jobs: fetch-depth: 0 token: ${{ secrets.GITHUB_TOKEN }} - - uses: pnpm/action-setup@v2 - - name: Set up Node ${{ matrix.node-version }} + - name: Set up pnpm + uses: pnpm/action-setup@v2 + - name: Set up node@${{ vars.NODE_VERSION }} uses: actions/setup-node@v3 with: cache: 'pnpm' - node-version: ${{ matrix.node-version }} + node-version: ${{ vars.NODE_VERSION }} - name: Install Dependencies run: pnpm i --ignore-scripts diff --git a/package.json b/package.json index fb19824abd..d833ff3f38 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,6 @@ "name": "viem", "description": "TypeScript Interface for Ethereum", "version": "0.3.3", - "packageManager": "pnpm@8.3.1", "scripts": { "anvil": "dotenv -- sh -c 'anvil --fork-url $VITE_ANVIL_FORK_URL --fork-block-number $VITE_ANVIL_BLOCK_NUMBER --block-time $VITE_ANVIL_BLOCK_TIME'", "bench": "vitest bench --no-threads", @@ -203,6 +202,7 @@ "simple-git-hooks": { "pre-commit": "pnpm format && pnpm lint:fix" }, + "packageManager": "pnpm@8.3.1", "pnpm": { "overrides": { "viem": "workspace:*"