From 482c560535732e37622cc84e456a880e68c6907e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Wed, 2 Oct 2024 14:57:15 +0200 Subject: [PATCH 1/4] fix: adjust ci workflows --- .github/workflows/bench.yml | 5 ++--- .github/workflows/book.yml | 4 ++-- .github/workflows/deny.yml | 4 ++-- .github/workflows/eth-sync.yml | 5 ++--- .github/workflows/hive.yml | 12 ++++-------- .github/workflows/integration.yml | 5 ++--- .github/workflows/lint.yml | 2 +- .github/workflows/op-sync.yml | 5 ++--- .github/workflows/stage.yml | 5 ++--- .github/workflows/unit.yml | 15 ++++++++------- 10 files changed, 27 insertions(+), 35 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 8ddc97441c2a..276ae3b9f1dd 100644 --- 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 index 56d5c427466e..d7f9fe34826e 100644 --- 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 index f85484ca2ec2..6908a3d5a561 100644 --- 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 index f473e29a57c6..d2fcc8ee2b7c 100644 --- 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 index 3155fd4af2d1..3954ef384397 100644 --- 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/discord-webhook@v6.0.0 diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 103a87706bca..6214ad022289 100644 --- 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,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/lint.yml b/.github/workflows/lint.yml index b7d9fc3a27ac..a0e13e37a89b 100644 --- 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 diff --git a/.github/workflows/op-sync.yml b/.github/workflows/op-sync.yml index 2a223391d711..37ef5a87c404 100644 --- 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 index 60ffa8f73d72..b3988a0a0ef3 100644 --- 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 index a6663aea8843..518e2668ba6a 100644 --- 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 From 6b146edcc0359ec90537fbd7d563beae2cad8635 Mon Sep 17 00:00:00 2001 From: Federico Gimenez Date: Thu, 26 Sep 2024 10:10:57 +0200 Subject: [PATCH 2/4] ci: pin clippy to working version (#11237) --- .github/workflows/lint.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a0e13e37a89b..56a3613da53c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -39,6 +39,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: From 3bb2bd1c43c81dfe270f5a36aacbddf6dc05a5fc Mon Sep 17 00:00:00 2001 From: nk_ysg Date: Wed, 2 Oct 2024 15:23:38 +0800 Subject: [PATCH 3/4] ci: pin clippy to working version (#11401) --- .github/workflows/lint.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 56a3613da53c..a547c986fe45 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -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 From ea51f9fc0bbef3cf9a740017452a74579fd09952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Wed, 2 Oct 2024 15:56:06 +0200 Subject: [PATCH 4/4] fix integration tests --- .github/workflows/integration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 6214ad022289..aa225516ae72 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -27,6 +27,8 @@ jobs: 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