Skip to content

Commit c4c276d

Browse files
Merge branch 'unstable' into meyer9/166-finalize-storage-interface
2 parents ca70cac + 799f8ae commit c4c276d

File tree

33 files changed

+1021
-230
lines changed

33 files changed

+1021
-230
lines changed

.github/workflows/bench.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ env:
1515
name: bench
1616
jobs:
1717
codspeed:
18-
runs-on:
19-
group: Reth
18+
runs-on: ubuntu-latest
2019
steps:
2120
- uses: actions/checkout@v5
2221
with:

.github/workflows/compact.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ env:
1717
name: compact-codec
1818
jobs:
1919
compact-codec:
20-
runs-on:
21-
group: Reth
20+
runs-on: ubuntu-latest
2221
strategy:
2322
matrix:
2423
bin:

.github/workflows/e2e.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ concurrency:
1919
jobs:
2020
test:
2121
name: e2e-testsuite
22-
runs-on:
23-
group: Reth
22+
runs-on: ubuntu-latest
2423
env:
2524
RUST_BACKTRACE: 1
2625
timeout-minutes: 90

.github/workflows/hive.yml

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ jobs:
2222
binary_name: reth
2323

2424
prepare-hive:
25-
if: github.repository == 'paradigmxyz/reth'
25+
if: github.repository == 'op-rs/op-reth'
2626
timeout-minutes: 45
27-
runs-on:
28-
group: Reth
27+
runs-on: ubuntu-latest
2928
steps:
3029
- uses: actions/checkout@v5
3130
- name: Checkout hive tests
@@ -34,14 +33,39 @@ jobs:
3433
repository: ethereum/hive
3534
path: hivetests
3635

36+
- name: Get hive commit hash
37+
id: hive-commit
38+
run: echo "hash=$(cd hivetests && git rev-parse HEAD)" >> $GITHUB_OUTPUT
39+
3740
- uses: actions/setup-go@v6
3841
with:
3942
go-version: "^1.13.1"
4043
- run: go version
4144

45+
- name: Restore hive assets cache
46+
id: cache-hive
47+
uses: actions/cache@v4
48+
with:
49+
path: ./hive_assets
50+
key: hive-assets-${{ steps.hive-commit.outputs.hash }}-${{ hashFiles('.github/assets/hive/build_simulators.sh') }}
51+
4252
- name: Build hive assets
53+
if: steps.cache-hive.outputs.cache-hit != 'true'
4354
run: .github/assets/hive/build_simulators.sh
4455

56+
- name: Load cached Docker images
57+
if: steps.cache-hive.outputs.cache-hit == 'true'
58+
run: |
59+
cd hive_assets
60+
for tar_file in *.tar; do
61+
if [ -f "$tar_file" ]; then
62+
echo "Loading $tar_file..."
63+
docker load -i "$tar_file"
64+
fi
65+
done
66+
# Make hive binary executable
67+
chmod +x hive
68+
4569
- name: Upload hive assets
4670
uses: actions/upload-artifact@v4
4771
with:
@@ -150,8 +174,7 @@ jobs:
150174
- prepare-reth
151175
- prepare-hive
152176
name: run ${{ matrix.scenario.sim }}${{ matrix.scenario.limit && format(' - {0}', matrix.scenario.limit) }}
153-
runs-on:
154-
group: Reth
177+
runs-on: ubuntu-latest
155178
permissions:
156179
issues: write
157180
steps:
@@ -218,8 +241,7 @@ jobs:
218241
notify-on-error:
219242
needs: test
220243
if: failure()
221-
runs-on:
222-
group: Reth
244+
runs-on: ubuntu-latest
223245
steps:
224246
- name: Slack Webhook Action
225247
uses: rtCamp/action-slack-notify@v2

.github/workflows/integration.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ jobs:
2323
test:
2424
name: test / ${{ matrix.network }}
2525
if: github.event_name != 'schedule'
26-
runs-on:
27-
group: Reth
26+
runs-on: ubuntu-latest
2827
env:
2928
RUST_BACKTRACE: 1
3029
strategy:

.github/workflows/kurtosis-op.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
name: run kurtosis
35-
runs-on:
36-
group: Reth
35+
runs-on: ubuntu-latest
3736
needs:
3837
- prepare-reth
3938
steps:
@@ -87,8 +86,7 @@ jobs:
8786
notify-on-error:
8887
needs: test
8988
if: failure()
90-
runs-on:
91-
group: Reth
89+
runs-on: ubuntu-latest
9290
steps:
9391
- name: Slack Webhook Action
9492
uses: rtCamp/action-slack-notify@v2

.github/workflows/kurtosis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
name: run kurtosis
33-
runs-on:
34-
group: Reth
33+
runs-on: ubuntu-latest
3534
needs:
3635
- prepare-reth
3736
steps:
@@ -59,8 +58,7 @@ jobs:
5958
notify-on-error:
6059
needs: test
6160
if: failure()
62-
runs-on:
63-
group: Reth
61+
runs-on: ubuntu-latest
6462
steps:
6563
- name: Slack Webhook Action
6664
uses: rtCamp/action-slack-notify@v2

.github/workflows/prepare-reth.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ on:
2424

2525
jobs:
2626
prepare-reth:
27-
if: github.repository == 'paradigmxyz/reth'
27+
if: github.repository == 'op-rs/op-reth'
2828
timeout-minutes: 45
29-
runs-on:
30-
group: Reth
29+
runs-on: ubuntu-latest
3130
steps:
3231
- uses: actions/checkout@v5
3332
- run: mkdir artifacts

.github/workflows/stage.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ jobs:
2222
name: stage-run-test
2323
# Only run stage commands test in merge groups
2424
if: github.event_name == 'merge_group'
25-
runs-on:
26-
group: Reth
25+
runs-on: ubuntu-latest
2726
env:
2827
RUST_LOG: info,sync=error
2928
RUST_BACKTRACE: 1

.github/workflows/sync-era.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ concurrency:
1717
jobs:
1818
sync:
1919
name: sync (${{ matrix.chain.bin }})
20-
runs-on:
21-
group: Reth
20+
runs-on: ubuntu-latest
2221
env:
2322
RUST_LOG: info,sync=error
2423
RUST_BACKTRACE: 1

0 commit comments

Comments
 (0)