fix: adjust ci workflows (#6)

* fix: adjust ci workflows * ci: pin clippy to working version (paradigmxyz#11237) * ci: pin clippy to working version (paradigmxyz#11401) * fix integration tests --------- Co-authored-by: Federico Gimenez <[email protected]> Co-authored-by: nk_ysg <[email protected]>
scroll-tech · Oct 2, 2024 · f56bf7a · f56bf7a
1 parent be7ad4c
commit f56bf7a
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 35 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main]
+    branches: [main, scroll]
 
 env:
   CARGO_TERM_COLOR: always
@@ -18,8 +18,7 @@ concurrency:
 name: bench
 jobs:
   iai:
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     # Only run benchmarks in merge groups and on main
     if: github.event_name != 'pull_request'
     steps:

diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
@@ -4,9 +4,9 @@ name: book
 
 on:
   push:
-    branches: [main]
+    branches: [main, scroll]
   pull_request:
-    branches: [main]
+    branches: [main, scroll]
   merge_group:
 
 jobs:

diff --git a/.github/workflows/deny.yml b/.github/workflows/deny.yml
@@ -4,10 +4,10 @@ name: deny
 
 on:
   push:
-    branches: [main]
+    branches: [main, scroll]
     paths: [Cargo.lock]
   pull_request:
-    branches: [main]
+    branches: [main, scroll]
     paths: [Cargo.lock]
   merge_group:
 

diff --git a/.github/workflows/eth-sync.yml b/.github/workflows/eth-sync.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [ main ]
+    branches: [ main, scroll ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -20,8 +20,7 @@ jobs:
     name: sync / 100k blocks
     # Only run sync tests in merge groups
     if: github.event_name == 'merge_group'
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1

diff --git a/.github/workflows/hive.yml b/.github/workflows/hive.yml
@@ -19,8 +19,7 @@ jobs:
   prepare-reth:
     if: github.repository == 'paradigmxyz/reth'
     timeout-minutes: 45
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - run: mkdir artifacts
@@ -53,8 +52,7 @@ jobs:
   prepare-hive:
     if: github.repository == 'paradigmxyz/reth'
     timeout-minutes: 45
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Checkout hive tests
@@ -182,8 +180,7 @@ jobs:
       - prepare-reth
       - prepare-hive
     name: run ${{ matrix.engine }} - ${{ matrix.scenario.sim }}${{ matrix.scenario.limit && format(' - {0}', matrix.scenario.limit) }}
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     permissions:
       issues: write
     steps:
@@ -256,8 +253,7 @@ jobs:
   notify-on-error:
     needs: test
     if: failure()
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     steps:
       - name: Discord Webhook Action
         uses: tsickert/[email protected]

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main]
+    branches: [main, scroll]
 
 env:
   CARGO_TERM_COLOR: always
@@ -19,15 +19,16 @@ concurrency:
 jobs:
   test:
     name: test / ${{ matrix.network }}
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_BACKTRACE: 1
     strategy:
       matrix:
         network: ["ethereum", "optimism"]
     timeout-minutes: 60
     steps:
+      - name: Free up disk space
+        run: rm -rf /opt/hostedtoolcache
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - name: Install Geth

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main]
+    branches: [main, scroll]
 
 env:
   CARGO_TERM_COLOR: always
@@ -24,6 +24,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@clippy
+        with:
+          toolchain: nightly-2024-09-25
+          components: clippy
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
@@ -39,6 +42,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly
         with:
+          toolchain: nightly-2024-09-25
           components: clippy
       - uses: Swatinem/rust-cache@v2
         with:

diff --git a/.github/workflows/op-sync.yml b/.github/workflows/op-sync.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [ main ]
+    branches: [ main, scroll ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -20,8 +20,7 @@ jobs:
     name: op sync / 10k blocks
     # Only run sync tests in merge groups
     if: github.event_name == 'merge_group'
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1

diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [ main ]
+    branches: [ main, scroll ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -22,8 +22,7 @@ jobs:
     name: stage-run-test
     # Only run stage commands test in merge groups
     if: github.event_name == 'merge_group'
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main]
+    branches: [main, scroll]
 
 env:
   CARGO_TERM_COLOR: always
@@ -19,8 +19,7 @@ concurrency:
 jobs:
   test:
     name: test / ${{ matrix.network }} (${{ matrix.partition }}/2)
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_BACKTRACE: 1
     strategy:
@@ -29,6 +28,8 @@ jobs:
         network: ["ethereum", "optimism"]
     timeout-minutes: 30
     steps:
+      - name: Free up disk space
+        run: rm -rf /opt/hostedtoolcache
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
@@ -45,13 +46,14 @@ jobs:
 
   state:
     name: Ethereum state tests
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1
     timeout-minutes: 30
     steps:
+      - name: Free up disk space
+        run: rm -rf /opt/hostedtoolcache
       - uses: actions/checkout@v4
       - name: Checkout ethereum/tests
         uses: actions/checkout@v4
@@ -70,8 +72,7 @@ jobs:
 
   doc:
     name: doc tests (${{ matrix.network }})
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_BACKTRACE: 1
     timeout-minutes: 30