Skip to content

Commit 5a92c47

Browse files
committed
Merge branch 'main' into l2/limit_block_to_blob_size
2 parents cdb1eec + c58d3b2 commit 5a92c47

File tree

88 files changed

+1402
-948
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1402
-948
lines changed

.github/workflows/ci_criterion_benchmark.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Block Import Benchmark
2+
3+
on:
4+
push:
5+
branches: [main]
6+
7+
permissions:
8+
# deployments permission to deploy GitHub pages website
9+
deployments: write
10+
# contents permission to update benchmark contents in gh-pages branch
11+
contents: write
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-24.04
16+
steps:
17+
- name: Install Rust
18+
uses: dtolnay/rust-toolchain@1.85.0
19+
- uses: actions/checkout@v4
20+
with:
21+
lfs: true
22+
- name: Checkout LFS objects
23+
run: git lfs checkout
24+
- name: Install gnuplot
25+
run: sudo apt-get install -y gnuplot
26+
- name: Run benchmark
27+
run: cd cmd/ethrex && cargo bench --bench criterion_benchmark -- --output-format bencher |sed 2d | tee output.txt
28+
- name: Store benchmark result
29+
uses: benchmark-action/github-action-benchmark@v1
30+
with:
31+
tool: "cargo"
32+
output-file-path: cmd/ethrex/output.txt
33+
benchmark-data-dir-path: "."
34+
# Access token to deploy GitHub Pages branch
35+
github-token: ${{ secrets.GITHUB_TOKEN }}
36+
# Push and deploy GitHub pages branch automatically
37+
auto-push: true
38+
alert-threshold: "130%"
39+
comment-on-alert: true

.github/workflows/ci_l1.yaml renamed to .github/workflows/pr-main_l1.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
branches: ["**"]
88
paths-ignore:
99
- "crates/vm/levm/**" # We run this in a separate workflow
10+
- "crates/l2/**" # Behind a feature flag not used in this workflow
1011

1112
concurrency:
1213
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/ci_l2.yaml renamed to .github/workflows/pr-main_l2.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
branches: ["**"]
77
paths:
88
- "crates/l2/**"
9+
- ".github/workflows/pr-main_l2.yaml"
910

1011
concurrency:
1112
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/ci_l2_contracts.yaml renamed to .github/workflows/pr-main_l2_contracts.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
branches: ["**"]
77
paths:
88
- "crates/l2/contracts/**"
9+
- ".github/workflows/pr-main_l2_contracts.yaml"
910

1011
concurrency:
1112
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/ci_l2_prover.yaml renamed to .github/workflows/pr-main_l2_prover.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
branches: ["main"]
55
pull_request:
66
branches: ["**"]
7+
paths:
8+
- "crates/l2/prover/**"
9+
- ".github/workflows/pr-main_l2_prover.yaml"
710

811
concurrency:
912
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/ci_l2_prover_nightly.yaml renamed to .github/workflows/pr-main_l2_prover_nightly.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
branches: ["main"]
66
pull_request:
77
branches: ["**"]
8+
paths:
9+
- "crates/l2/prover/**"
10+
- ".github/workflows/pr-main_l2_prover_nightly.yaml"
811

912
concurrency:
1013
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/ci_levm.yaml renamed to .github/workflows/pr-main_levm.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
branches: ["**"]
88
paths:
99
- "crates/vm/levm/**"
10+
- ".github/workflows/pr-main_levm.yaml"
1011

1112
concurrency:
1213
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

0 commit comments

Comments
 (0)