From 1f7381a1aa3b6f2f410594270c29b4d80d52a3fa Mon Sep 17 00:00:00 2001 From: Emilia Hane Date: Thu, 19 Dec 2024 02:41:35 +0100 Subject: [PATCH 1/2] Run tests on github runners --- .github/workflows/compact.yml | 3 +-- .github/workflows/hive.yml | 9 +++------ .github/workflows/integration.yml | 3 +-- .github/workflows/kurtosis-op.yml | 6 ++---- .github/workflows/prepare-reth.yml | 3 +-- .github/workflows/sync.yml | 3 +-- .github/workflows/unit.yml | 9 +++------ 7 files changed, 12 insertions(+), 24 deletions(-) diff --git a/.github/workflows/compact.yml b/.github/workflows/compact.yml index 484b27c820d0..26e3f1e7953e 100644 --- a/.github/workflows/compact.yml +++ b/.github/workflows/compact.yml @@ -18,8 +18,7 @@ env: name: compact-codec jobs: compact-codec: - runs-on: - group: Reth + runs-on: ubuntu-latest strategy: matrix: bin: diff --git a/.github/workflows/hive.yml b/.github/workflows/hive.yml index 334df715a263..8a96d6a38348 100644 --- a/.github/workflows/hive.yml +++ b/.github/workflows/hive.yml @@ -25,8 +25,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 @@ -153,8 +152,7 @@ jobs: - prepare-reth - prepare-hive name: run ${{ matrix.scenario.sim }}${{ matrix.scenario.limit && format(' - {0}', matrix.scenario.limit) }} - runs-on: - group: Reth + runs-on: ubuntu-latest permissions: issues: write steps: @@ -221,8 +219,7 @@ jobs: notify-on-error: needs: test if: failure() - runs-on: - group: Reth + runs-on: ubuntu-latest steps: - name: Slack Webhook Action uses: rtCamp/action-slack-notify@v2 diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 82bd5705a320..a153cc77741c 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -19,8 +19,7 @@ concurrency: jobs: test: name: test / ${{ matrix.network }} - runs-on: - group: Reth + runs-on: ubuntu-latest env: RUST_BACKTRACE: 1 strategy: diff --git a/.github/workflows/kurtosis-op.yml b/.github/workflows/kurtosis-op.yml index 85a8e706c6eb..127e33074d1e 100644 --- a/.github/workflows/kurtosis-op.yml +++ b/.github/workflows/kurtosis-op.yml @@ -29,8 +29,7 @@ jobs: strategy: fail-fast: false name: run kurtosis - runs-on: - group: Reth + runs-on: ubuntu-latest needs: - prepare-reth steps: @@ -84,8 +83,7 @@ jobs: notify-on-error: needs: test if: failure() - runs-on: - group: Reth + runs-on: ubuntu-latest steps: - name: Slack Webhook Action uses: rtCamp/action-slack-notify@v2 diff --git a/.github/workflows/prepare-reth.yml b/.github/workflows/prepare-reth.yml index 1b5f0e70cc96..53a5f253819a 100644 --- a/.github/workflows/prepare-reth.yml +++ b/.github/workflows/prepare-reth.yml @@ -26,8 +26,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 diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 531d04b2e489..1f7d592a0405 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -15,8 +15,7 @@ concurrency: jobs: sync: name: sync (${{ matrix.chain.bin }}) - 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 4c927df8be00..098ed4b2c5d5 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -19,8 +19,7 @@ concurrency: jobs: test: name: test / ${{ matrix.type }} (${{ matrix.partition }}/${{ matrix.total_partitions }}) - runs-on: - group: Reth + runs-on: ubuntu-latest env: RUST_BACKTRACE: 1 strategy: @@ -68,8 +67,7 @@ jobs: state: name: Ethereum state tests - runs-on: - group: Reth + runs-on: ubuntu-latest env: RUST_LOG: info,sync=error RUST_BACKTRACE: 1 @@ -93,8 +91,7 @@ jobs: doc: name: doc tests (${{ matrix.network }}) - runs-on: - group: Reth + runs-on: ubuntu-latest env: RUST_BACKTRACE: 1 timeout-minutes: 30 From ee12431fdca28f8dfd07a532f198546624849e5f Mon Sep 17 00:00:00 2001 From: Emilia Hane Date: Thu, 19 Dec 2024 03:07:04 +0100 Subject: [PATCH 2/2] Disable some non-op-reth jobs --- .github/workflows/bench.yml | 4 +++- .github/workflows/compact.yml | 2 +- .github/workflows/integration.yml | 5 ++++- .github/workflows/kurtosis.yml | 2 ++ .github/workflows/lint.yml | 10 +++++----- .github/workflows/release.yml | 4 ++-- .github/workflows/stage.yml | 4 +++- .github/workflows/sync.yml | 12 ++++++------ .github/workflows/unit.yml | 21 ++++++++++++--------- 9 files changed, 38 insertions(+), 26 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 8ddc97441c2a..773599ef4c87 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -18,10 +18,12 @@ concurrency: name: bench jobs: iai: + # Skip non-op-reth job + if: false runs-on: group: Reth # Only run benchmarks in merge groups and on main - if: github.event_name != 'pull_request' + #if: github.event_name != 'pull_request' steps: - uses: actions/checkout@v4 - name: Install Valgrind diff --git a/.github/workflows/compact.yml b/.github/workflows/compact.yml index 26e3f1e7953e..1ec2edb79bc3 100644 --- a/.github/workflows/compact.yml +++ b/.github/workflows/compact.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: bin: - - cargo run --bin reth --features "dev" + #- cargo run --bin reth --features "dev" - cargo run --bin op-reth --features "optimism dev" --manifest-path crates/optimism/bin/Cargo.toml steps: - uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index a153cc77741c..776b4b3ace7e 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -24,7 +24,10 @@ jobs: RUST_BACKTRACE: 1 strategy: matrix: - network: ["ethereum", "optimism"] + network: [ + #"ethereum", + "optimism" + ] timeout-minutes: 60 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/kurtosis.yml b/.github/workflows/kurtosis.yml index ab0c95939c8e..167caf8f8627 100644 --- a/.github/workflows/kurtosis.yml +++ b/.github/workflows/kurtosis.yml @@ -27,6 +27,8 @@ jobs: strategy: fail-fast: false name: run kurtosis + # Skip non-op-reth job + if: false runs-on: group: Reth needs: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 418fd4cc4e68..f409206e5290 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,9 +17,9 @@ jobs: strategy: matrix: include: - - type: ethereum - args: --bin reth --workspace --lib --examples --tests --benches --locked - features: "ethereum asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs" + #- type: ethereum + # args: --bin reth --workspace --lib --examples --tests --benches --locked + # features: "ethereum asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs" - type: optimism args: --bin op-reth --workspace --lib --examples --tests --benches --locked features: "optimism asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs" @@ -111,8 +111,8 @@ jobs: strategy: matrix: include: - - binary: reth - network: ethereum + #- binary: reth + # network: ethereum - binary: op-reth network: optimism steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5735ae6ef528..84549419821d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,8 +48,8 @@ jobs: os: ubuntu-20.04 profile: maxperf build: - - command: build - binary: reth + #- command: build + # binary: reth - command: op-build binary: op-reth steps: diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index 60ffa8f73d72..30c12e33e0b5 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -20,8 +20,10 @@ concurrency: jobs: stage: name: stage-run-test + # Skip non-op-reth job + if: false # Only run stage commands test in merge groups - if: github.event_name == 'merge_group' + #if: github.event_name == 'merge_group' runs-on: group: Reth env: diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 1f7d592a0405..b2b358c54d66 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -23,12 +23,12 @@ jobs: strategy: matrix: chain: - - build: install - bin: reth - chain: mainnet - tip: "0x91c90676cab257a59cd956d7cb0bceb9b1a71d79755c23c7277a0697ccfaf8c4" - block: 100000 - unwind-target: "0x52e0509d33a988ef807058e2980099ee3070187f7333aae12b64d4d675f34c5a" + #- build: install + # bin: reth + # chain: mainnet + # tip: "0x91c90676cab257a59cd956d7cb0bceb9b1a71d79755c23c7277a0697ccfaf8c4" + # block: 100000 + # unwind-target: "0x52e0509d33a988ef807058e2980099ee3070187f7333aae12b64d4d675f34c5a" - build: install-op bin: op-reth chain: base diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 098ed4b2c5d5..1ae490be7222 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -25,14 +25,14 @@ jobs: strategy: matrix: include: - - type: ethereum - args: --features "asm-keccak ethereum" --locked - partition: 1 - total_partitions: 2 - - type: ethereum - args: --features "asm-keccak ethereum" --locked - partition: 2 - total_partitions: 2 + #- type: ethereum + # args: --features "asm-keccak ethereum" --locked + # partition: 1 + # total_partitions: 2 + #- type: ethereum + # args: --features "asm-keccak ethereum" --locked + # partition: 2 + # total_partitions: 2 - type: optimism args: --features "asm-keccak optimism" --locked --exclude reth --exclude reth-bench --exclude "example-*" --exclude "reth-ethereum-*" --exclude "*-ethereum" partition: 1 @@ -97,7 +97,10 @@ jobs: timeout-minutes: 30 strategy: matrix: - network: ["ethereum", "optimism"] + network: [ + #"ethereum", + "optimism" + ] steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable