From 32ea412bbd72a76057dcf49a35a36da4ce75ed83 Mon Sep 17 00:00:00 2001 From: j75689 Date: Tue, 30 Apr 2024 16:02:39 +0800 Subject: [PATCH] ci: fix unit, integration test job --- .github/workflows/integration.yml | 9 ++++----- .github/workflows/unit.yml | 6 ++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 319896154b..c9994db667 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -19,13 +19,13 @@ concurrency: jobs: test: name: test / ${{ matrix.network }} - runs-on: - group: Reth + runs-on: ubuntu-latest env: RUST_BACKTRACE: 1 strategy: matrix: network: ["ethereum", "optimism"] + extra-features: ["", "opbnb"] timeout-minutes: 60 steps: - uses: actions/checkout@v4 @@ -40,7 +40,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 \ -E "kind(test)" - if: matrix.network == 'optimism' @@ -53,8 +53,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/unit.yml b/.github/workflows/unit.yml index f756516ecc..8250c29538 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -26,6 +26,7 @@ jobs: matrix: partition: [1, 2] network: ["ethereum", "optimism"] + extra-features: ["", "opbnb"] timeout-minutes: 30 steps: - uses: actions/checkout@v4 @@ -37,7 +38,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)" @@ -74,6 +75,7 @@ jobs: strategy: matrix: network: ["ethereum", "optimism"] + extra-features: ["", "opbnb"] steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable @@ -81,7 +83,7 @@ jobs: 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