Skip to content

Commit

Permalink
Merge branch 'isthmus-devnet-0' into emhane/storage-root-isthmus
Browse files Browse the repository at this point in the history
  • Loading branch information
emhane committed Dec 19, 2024
2 parents 5504f24 + e5fc38f commit 28636f7
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 50 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/compact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ env:
name: compact-codec
jobs:
compact-codec:
runs-on:
group: Reth
runs-on: ubuntu-latest
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
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/hive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ concurrency:
jobs:
test:
name: test / ${{ matrix.network }}
runs-on:
group: Reth
runs-on: ubuntu-latest
env:
RUST_BACKTRACE: 1
strategy:
matrix:
network: ["ethereum", "optimism"]
network: [
#"ethereum",
"optimism"
]
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/kurtosis-op.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ jobs:
strategy:
fail-fast: false
name: run kurtosis
runs-on:
group: Reth
runs-on: ubuntu-latest
needs:
- prepare-reth
steps:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/kurtosis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
strategy:
fail-fast: false
name: run kurtosis
# Skip non-op-reth job
if: false
runs-on:
group: Reth
needs:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -111,8 +111,8 @@ jobs:
strategy:
matrix:
include:
- binary: reth
network: ethereum
#- binary: reth
# network: ethereum
- binary: op-reth
network: optimism
steps:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/prepare-reth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,20 @@ 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
timeout-minutes: 60
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
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,20 @@ 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:
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
Expand Down Expand Up @@ -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
Expand All @@ -93,14 +91,16 @@ jobs:

doc:
name: doc tests (${{ matrix.network }})
runs-on:
group: Reth
runs-on: ubuntu-latest
env:
RUST_BACKTRACE: 1
timeout-minutes: 30
strategy:
matrix:
network: ["ethereum", "optimism"]
network: [
#"ethereum",
"optimism"
]
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand Down

0 comments on commit 28636f7

Please sign in to comment.