ci: minor fixes (#4831)

.github/workflows/bench.yml

@@ -62,7 +62,7 @@ jobs:
   bench-success:
     if: always()
     name: bench success
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       # Note: This check is a dummy because we don't have any bench checks enabled.
       - run: echo OK.

.github/workflows/book.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: test
     timeout-minutes: 60
 
@@ -31,7 +31,7 @@ jobs:
         run: mdbook test
 
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: lint
     timeout-minutes: 60
 
@@ -50,7 +50,7 @@ jobs:
         run: mdbook-linkcheck --standalone
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
@@ -69,6 +69,8 @@ jobs:
           echo $(pwd)/mdbook-template >> $GITHUB_PATH
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
 
       - name: Build book
         run: mdbook build
@@ -111,7 +113,7 @@ jobs:
   deploy:
     # Only deploy if a push to main
     if: github.ref_name == 'main' && github.event_name == 'push'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [test, lint, build]
 
     # Grant GITHUB_TOKEN the permissions required to make a Pages deployment

.github/workflows/ci.yml

@@ -17,6 +17,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@clippy
       - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
       - run: cargo clippy --workspace --all-targets --all-features
         env:
           RUSTFLAGS: -D warnings
@@ -29,6 +31,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@nightly
       - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
       - run: cargo docs --document-private-items
         env:
           # Keep in sync with ./book.yml:jobs.build

.github/workflows/deny.yml

@@ -18,7 +18,7 @@ concurrency: deny-${{ github.head_ref || github.run_id }}
 jobs:
   deny:
     name: deny
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: EmbarkStudios/cargo-deny-action@v1

.github/workflows/fuzz.yml

@@ -64,7 +64,7 @@ jobs:
   fuzz-success:
     if: always()
     name: fuzz success
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: all
     steps:
       # Note: This check is a dummy because we currently have fuzz tests disabled.

.github/workflows/release.yml

@@ -15,38 +15,42 @@ env:
 jobs:
   extract-version:
     name: extract version
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Extract version
         run: echo "VERSION=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT
         id: extract_version
     outputs:
       VERSION: ${{ steps.extract_version.outputs.VERSION }}
+
   build:
     name: build release
     strategy:
       matrix:
-        arch: [aarch64-unknown-linux-gnu,
-               x86_64-unknown-linux-gnu,
-               x86_64-apple-darwin,
-               aarch64-apple-darwin,
-               x86_64-pc-windows-gnu]
+        arch:
+          [
+            aarch64-unknown-linux-gnu,
+            x86_64-unknown-linux-gnu,
+            x86_64-apple-darwin,
+            aarch64-apple-darwin,
+            x86_64-pc-windows-gnu,
+          ]
         include:
-          -   arch: aarch64-unknown-linux-gnu
-              platform: ubuntu-20.04
-              profile: maxperf
-          -   arch: x86_64-unknown-linux-gnu
-              platform: ubuntu-20.04
-              profile: maxperf
-          -   arch: x86_64-apple-darwin
-              platform: macos-latest
-              profile: maxperf
-          -   arch: aarch64-apple-darwin
-              platform: macos-latest
-              profile: maxperf
-          -   arch: x86_64-pc-windows-gnu
-              platform: ubuntu-20.04
-              profile: maxperf
+          - arch: aarch64-unknown-linux-gnu
+            platform: ubuntu-20.04
+            profile: maxperf
+          - arch: x86_64-unknown-linux-gnu
+            platform: ubuntu-20.04
+            profile: maxperf
+          - arch: x86_64-apple-darwin
+            platform: macos-latest
+            profile: maxperf
+          - arch: aarch64-apple-darwin
+            platform: macos-latest
+            profile: maxperf
+          - arch: x86_64-pc-windows-gnu
+            platform: ubuntu-20.04
+            profile: maxperf
 
     runs-on: ${{ matrix.platform }}
     needs: extract-version
@@ -76,18 +80,18 @@ jobs:
       # ==============================
 
       - name: Build reth for ${{ matrix.arch }}
-        run:  |
+        run: |
           cargo install cross
           env PROFILE=${{ matrix.profile }} make build-${{ matrix.arch }}
 
       - name: Move cross-compiled binary
-        if:   matrix.arch != 'x86_64-pc-windows-gnu'
+        if: matrix.arch != 'x86_64-pc-windows-gnu'
         run: |
           mkdir artifacts
           mv target/${{ matrix.arch }}/${{ matrix.profile }}/reth ./artifacts
 
       - name: Move cross-compiled binary (Windows)
-        if:   matrix.arch == 'x86_64-pc-windows-gnu'
+        if: matrix.arch == 'x86_64-pc-windows-gnu'
         run: |
           mkdir artifacts
           mv target/${{ matrix.arch }}/${{ matrix.profile }}/reth.exe ./artifacts
@@ -113,8 +117,8 @@ jobs:
       # Upload artifacts
       # This is required to share artifacts between different jobs
       # =======================================================================
-      - name:  Upload artifact
-        uses:  actions/upload-artifact@v3
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
         with:
           name: reth-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz
           path: reth-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz
@@ -127,10 +131,10 @@ jobs:
 
   draft-release:
     name: draft release
-    needs:  [build, extract-version]
-    runs-on: ubuntu-20.04
+    needs: [build, extract-version]
+    runs-on: ubuntu-latest
     env:
-      VERSION:  ${{ needs.extract-version.outputs.VERSION }}
+      VERSION: ${{ needs.extract-version.outputs.VERSION }}
     permissions:
       # Required to post the release
       contents: write
@@ -162,7 +166,8 @@ jobs:
           GITHUB_USER: ${{ github.repository_owner }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-        # The formatting here is borrowed from Lighthouse (which is borrowed from OpenEthereum): https://github.com/openethereum/openethereum/blob/main/.github/workflows/build.yml
+        # The formatting here is borrowed from Lighthouse (which is borrowed from OpenEthereum):
+        # https://github.com/openethereum/openethereum/blob/main/.github/workflows/build.yml
         run: |
           body=$(cat <<- "ENDBODY"
           <Release Name>

.github/workflows/sanity.yml

@@ -15,7 +15,7 @@ env:
 name: sanity
 jobs:
   dep-version-constraints:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: dep version constraints test (partition ${{ matrix.partition }}/${{ strategy.job-total }})
     strategy:
       matrix:
@@ -64,7 +64,7 @@ jobs:
           filename: .github/SANITY_DEPS_ISSUE_TEMPLATE.md
 
   unused-deps:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: unused dependencies
     steps:
       - name: Checkout sources

.github/workflows/stale.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   close-issues:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       issues: write
       pull-requests: write

.github/workflows/unit.yml

@@ -69,7 +69,7 @@ jobs:
           repository: ethereum/tests
           path: testing/ef-tests/ethereum-tests
           submodules: recursive
-          depth: 1
+          fetch-depth: 1
 
       - name: Install toolchain
         uses: actions-rs/toolchain@v1
@@ -102,7 +102,7 @@ jobs:
   unit-success:
     if: always()
     name: unit success
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [test, eth-blockchain, doc-test]
     timeout-minutes: 60
     steps: