chore: attempt to fix some more ci actions

Author: gabrocheleau

.github/workflows/block-build.yml

@@ -17,62 +17,42 @@ on:
         required: false
         default: 'none'
 
-env:
-  cwd: ${{github.workspace}}/packages/block
-
-defaults:
-  run:
-    working-directory: packages/block
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-block
   cancel-in-progress: true
 
+env:
+  CI: true
+
 jobs:
   test-block:
-    runs-on: ubuntu-latest
-    steps:     
-      # We clone the repo and submodules if triggered from work-flow dispatch
-      - if: inputs.submodule-cache-key == 'none'
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Checkout repository
         uses: actions/checkout@v5
         with:
           submodules: recursive
 
-      # We restore the code/deps from cache if triggered from workflow_call (i.e. have valid cache key)
-      - if: inputs.dep-cache-key != 'none' 
-        uses: actions/cache/restore@v4
-        id: dep-cache
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
         with:
-          path: ${{github.workspace}}
-          key: ${{ inputs.dep-cache-key }}
-  
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 10.5.2
           run_install: false
 
-      - name: Use Node.js 20
+      - name: Setup Node.js
         uses: actions/setup-node@v5
         with:
-          node-version: 20
+          node-version: '20'
+          cache: 'pnpm'
 
-      - name: Install Dependencies (if called from workflow_dispatch)
-        if: steps.dep-cache.outputs.cache-hit != 'true'
-        run: pnpm install --frozen-lockfile
+      - name: Install dependencies (workspace root)
         working-directory: ${{ github.workspace }}
+        run: pnpm install --frozen-lockfile
 
-      - if: inputs.submodule-cache-key != 'none'
-        uses: actions/cache/restore@v4
-        name: Initialize ethereum-tests
-        id: submodules-cache
-        with:
-          path: ${{github.workspace}}/packages/ethereum-tests
-          key: ${{ inputs.submodule-cache-key}}
-          fail-on-cache-miss: true
+      - name: Build @ethereumjs/block
+        working-directory: ${{ github.workspace }}/packages/block
+        run: pnpm run build
 
-      - run: pnpm run coverage
-      - uses: codecov/codecov-action@v4
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ${{ github.workspace}}/packages/block/coverage/lcov.info
-          flags: block
+      - name: Test @ethereumjs/block
+        working-directory: ${{ github.workspace }}/packages/block
+        run: pnpm run test

.github/workflows/blockchain-build.yml

@@ -14,49 +14,41 @@ on:
         required: false
         default: 'none'
 
-env:
-  cwd: ${{github.workspace}}/packages/blockchain
-
-defaults:
-  run:
-    working-directory: packages/blockchain
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-blockchain
   cancel-in-progress: true
 
+env:
+  CI: true
+
 jobs:
   test-blockchain:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+
     steps:
-      # We clone the repo and submodules if triggered from work-flow dispatch
-      - if: inputs.submodule-cache-key == 'none'
+      - name: Checkout repository
         uses: actions/checkout@v5
+        with:
+          submodules: recursive
 
-      # We restore the code/deps from cache if triggered from workflow_call (i.e. have valid cache key)
-      - uses: actions/cache/restore@v4
-        id: dep-cache
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
         with:
-          path: ${{github.workspace}}
-          key: ${{ inputs.dep-cache-key }}
+          run_install: false
 
-      - name: Use Node.js 20
+      - name: Setup Node.js
         uses: actions/setup-node@v5
         with:
-          node-version: 20
+          node-version: '20'
           cache: 'pnpm'
 
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 10.5.2
-          run_install: false
-
-      - name: Install Dependencies (if called from workflow_dispatch)
-        if: steps.dep-cache.outputs.cache-hit != 'true'
-        run: pnpm install --frozen-lockfile
+      - name: Install dependencies (workspace root)
         working-directory: ${{ github.workspace }}
+        run: pnpm install --frozen-lockfile
 
-      - run: pnpm run coverage
+      - name: Test @ethereumjs/blockchain
+        working-directory: ${{ github.workspace }}/packages/blockchain
+        run: pnpm run coverage
       - uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/client-build.yml

@@ -14,92 +14,43 @@ on:
         required: false
         default: 'none'
 
-
-env:
-  cwd: ${{github.workspace}}/packages/client
-
-defaults:
-  run:
-    working-directory: packages/client
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-client
   cancel-in-progress: true
 
+env:
+  CI: true
 
 jobs:
   test-client:
     if: contains(join(github.event.pull_request.labels.*.name, ' '), 'test client')
-    runs-on: ubuntu-latest
-    steps:
-      # We clone the repo and submodules if triggered from work-flow dispatch
-      - if: inputs.submodule-cache-key == 'none'
-        uses: actions/checkout@v5
-
-      - if: inputs.dep-cache-key != 'none' 
-        uses: actions/cache/restore@v4
-        id: dep-cache
-        with:
-          path: ${{github.workspace}}
-          key: ${{ inputs.dep-cache-key }}
-
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 10.5.2
-          run_install: false
-
-      - name: Use Node.js 20
-        uses: actions/setup-node@v5
-        with:
-          node-version: 20
-
-      - name: Install Dependencies (if not restored from cache)
-        if: steps.dep-cache.outputs.cache-hit != 'true'
-        run: pnpm install --frozen-lockfile
-        working-directory: ${{ github.workspace }}
-
-      - run: pnpm run coverage
-      - uses: codecov/codecov-action@v4
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ${{ env.cwd }}/coverage/lcov.info
-          flags: client
+    runs-on: ubuntu-24.04
 
-      - uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: cd ${{github.workspace}}/packages/client && pnpm run test:integration
-
-  test-client-cli:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     steps:
-      - if: inputs.submodule-cache-key == 'none'
+      - name: Checkout repository
         uses: actions/checkout@v5
-
-      # We restore the code/deps from cache if triggered from workflow_call (i.e. have valid cache key)
-      - if: inputs.dep-cache-key != 'none' 
-        uses: actions/cache/restore@v4
-        id: dep-cache
         with:
-          path: ${{github.workspace}}
-          key: ${{ inputs.dep-cache-key }}
+          submodules: recursive
 
-      - uses: pnpm/action-setup@v4
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
         with:
-          version: 10.5.2
           run_install: false
 
-      - name: Use Node.js 20
+      - name: Setup Node.js
         uses: actions/setup-node@v5
         with:
-          node-version: 20
+          node-version: '20'
+          cache: 'pnpm'
 
-      - name: Install Dependencies (if not restored from cache)
-        if: steps.dep-cache.outputs.cache-hit != 'true'
-        run: pnpm install --frozen-lockfile
+      - name: Install dependencies (workspace root)
         working-directory: ${{ github.workspace }}
+        run: pnpm install --frozen-lockfile
+
+      - name: Build @ethereumjs/client
+        working-directory: ${{ github.workspace }}/packages/client
+        run: pnpm run build
 
-      - run: cd ${{github.workspace}}/packages/client && npx vitest run test/cli/cli
+      - name: Test @ethereumjs/client
+        working-directory: ${{ github.workspace }}/packages/client
+        run: pnpm run test

.github/workflows/common-build.yml

@@ -14,63 +14,42 @@ on:
         required: false
         default: 'none'
 
-env:
-  cwd: ${{github.workspace}}/packages/common
-
-defaults:
-  run:
-    working-directory: packages/common
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-common
   cancel-in-progress: true
 
+env:
+  CI: true
+
 jobs:
   test-common:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
-      # We clone the repo and submodules if triggered from work-flow dispatch
-      - if: inputs.submodule-cache-key == 'none'
+      - name: Checkout repository
         uses: actions/checkout@v5
-
-      # We restore the code/deps from cache if triggered from workflow_call (i.e. have valid cache key)
-      - if: inputs.dep-cache-key != 'none' 
-        uses: actions/cache/restore@v4
-        id: dep-cache
         with:
-          path: ${{github.workspace}}
-          key: ${{ inputs.dep-cache-key }}
+          submodules: recursive
 
-      - uses: pnpm/action-setup@v4
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
         with:
-          version: 10.5.2
           run_install: false
 
-      - name: Use Node.js 20
+      - name: Setup Node.js
         uses: actions/setup-node@v5
         with:
-          node-version: 20
+          node-version: '20'
+          cache: 'pnpm'
 
-      - name: Install Dependencies (if not restored from cache)
-        if: steps.dep-cache.outputs.cache-hit != 'true'
-        run: pnpm install --frozen-lockfile
+      - name: Install dependencies (workspace root)
         working-directory: ${{ github.workspace }}
+        run: pnpm install --frozen-lockfile
 
-        # Run coverage for common
-      - run: pnpm run coverage
-      - uses: codecov/codecov-action@v4
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ${{ env.cwd }}/coverage/lcov.info
-          flags: common
+      - name: Build @ethereumjs/common
+        working-directory: ${{ github.workspace }}/packages/common
+        run: pnpm run build
 
-        # Run coverage for util
-      - run: pnpm run coverage
-        working-directory: ${{ github.workspace }}/packages/util
-        
-      - uses: codecov/codecov-action@v4
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ${{ env.cwd }}/coverage/lcov.info
-          flags: util
+      - name: Test @ethereumjs/common
+        working-directory: ${{ github.workspace }}/packages/common
+        run: pnpm run test