ci: fix unit, integration test job

bnb-chain · Apr 30, 2024 · 58052aa · 58052aa
1 parent 3ce4990
commit 58052aa
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -19,13 +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"]
+        include:
+          - network: ethereum
+            extra-features: ""
+          - network: optimism
+            extra-features: "opbnb"
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
@@ -40,21 +43,20 @@ jobs:
         name: Run tests
         run: |
           cargo nextest run \
-            --locked --features "asm-keccak ${{ matrix.network }}" \
+            --locked --features "asm-keccak ${{ matrix.network }} $${{ matrix.extra-features }}" \
             --workspace --exclude examples --exclude ef-tests \
             -E "kind(test)"
       - if: matrix.network == 'optimism'
         name: Run tests
         run: |
           cargo nextest run \
-            --locked -p reth-node-optimism --features "optimism"
+            --locked -p reth-node-optimism --features "optimism ${{ matrix.extra-features }}"
 
   sync:
     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/unit.yml b/.github/workflows/unit.yml
@@ -24,8 +24,12 @@ jobs:
       RUST_BACKTRACE: 1
     strategy:
       matrix:
-        partition: [1, 2]
-        network: ["ethereum", "optimism"]
+        partitions: [1, 2]
+        include:
+          - network: ethereum
+            extra-features: ""
+          - network: optimism
+            extra-features: "opbnb"
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
@@ -37,7 +41,7 @@ jobs:
       - name: Run tests
         run: |
           cargo nextest run \
-            --locked --features "asm-keccak ${{ matrix.network }}" \
+            --locked --features "asm-keccak ${{ matrix.network }} ${{ matrix.extra-features }}" \
             --workspace --exclude examples --exclude ef-tests \
             --partition hash:${{ matrix.partition }}/2 \
             -E "!kind(test)"
@@ -73,15 +77,19 @@ jobs:
     timeout-minutes: 30
     strategy:
       matrix:
-        network: ["ethereum", "optimism"]
+        include:
+          - network: ethereum
+            extra-features: ""
+          - network: optimism
+            extra-features: "opbnb"
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
       - name: Run doctests
-        run: cargo test --doc --workspace --features "${{ matrix.network }}"
+        run: cargo test --doc --workspace --features "${{ matrix.network }} ${{ matrix.extra-features }}"
 
   unit-success:
     name: unit success