Skip to content

Commit eb8b6fd

Browse files
tac0turtletac0turtle
committed
Merge branch 'main' into marko/docs_rewrite
2 parents 1c49f44 + c449847 commit eb8b6fd

57 files changed

Lines changed: 901 additions & 673 deletions

Some content is hidden

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

‎.github/workflows/benchmark.yml‎

Lines changed: 100 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,54 +5,140 @@ permissions: {}
55
push:
66
branches:
77
- main
8+
pull_request:
9+
branches:
10+
- main
811
workflow_dispatch:
912

1013
jobs:
1114
evm-benchmark:
1215
name: EVM Contract Benchmark
1316
runs-on: ubuntu-latest
1417
timeout-minutes: 30
15-
permissions:
16-
contents: write
17-
issues: write
1818
steps:
19-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2020
- name: Set up Go
21-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
21+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
2222
with:
2323
go-version-file: ./go.mod
2424
- name: Set up Docker Buildx
2525
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
26+
- name: Install just
27+
uses: extractions/setup-just@v3
2628
- name: Build binaries
27-
run: make build-evm build-da
29+
run: just build-evm build-da
2830
- name: Run EVM benchmarks
2931
run: |
3032
cd test/e2e && go test -tags evm -bench=. -benchmem -run='^$' \
3133
-timeout=10m --evm-binary=../../build/evm | tee output.txt
32-
- name: Store benchmark result
34+
- name: Run Block Executor benchmarks
35+
run: |
36+
go test -bench=BenchmarkProduceBlock -benchmem -run='^$' \
37+
./block/internal/executing/... > block_executor_output.txt
38+
- name: Upload benchmark results
39+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
40+
with:
41+
name: evm-benchmark-results
42+
path: |
43+
test/e2e/output.txt
44+
block_executor_output.txt
45+
46+
spamoor-benchmark:
47+
name: Spamoor Trace Benchmark
48+
runs-on: ubuntu-latest
49+
timeout-minutes: 30
50+
steps:
51+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
52+
- name: Set up Go
53+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
54+
with:
55+
go-version-file: ./go.mod
56+
- name: Set up Docker Buildx
57+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
58+
- name: Install just
59+
uses: extractions/setup-just@v3
60+
- name: Build binaries
61+
run: just build-evm build-da
62+
- name: Run Spamoor smoke test
63+
run: |
64+
cd test/e2e && BENCH_JSON_OUTPUT=spamoor_bench.json go test -tags evm \
65+
-run='^TestSpamoorSmoke$' -v -timeout=15m --evm-binary=../../build/evm
66+
- name: Upload benchmark results
67+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
68+
with:
69+
name: spamoor-benchmark-results
70+
path: test/e2e/spamoor_bench.json
71+
72+
# single job to push all results to gh-pages sequentially, avoiding race conditions
73+
publish-benchmarks:
74+
name: Publish Benchmark Results
75+
needs: [evm-benchmark, spamoor-benchmark]
76+
runs-on: ubuntu-latest
77+
permissions:
78+
contents: write
79+
issues: write
80+
pull-requests: write
81+
steps:
82+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
83+
- name: Download EVM benchmark results
84+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
85+
with:
86+
name: evm-benchmark-results
87+
- name: Download Spamoor benchmark results
88+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
89+
with:
90+
name: spamoor-benchmark-results
91+
path: test/e2e/
92+
93+
# only update the benchmark baseline on push/dispatch, not on PRs
94+
- name: Store EVM Contract Roundtrip result
95+
if: always()
3396
uses: benchmark-action/github-action-benchmark@4bdcce38c94cec68da58d012ac24b7b1155efe8b # v1.20.7
3497
with:
3598
name: EVM Contract Roundtrip
3699
tool: 'go'
37100
output-file-path: test/e2e/output.txt
38-
auto-push: true
101+
auto-push: ${{ github.event_name != 'pull_request' }}
102+
save-data-file: ${{ github.event_name != 'pull_request' }}
39103
github-token: ${{ secrets.GITHUB_TOKEN }}
40104
alert-threshold: '150%'
41105
fail-on-alert: true
42106
comment-on-alert: true
43107

44-
- name: Run Block Executor benchmarks
45-
run: |
46-
go test -bench=BenchmarkProduceBlock -benchmem -run='^$' \
47-
./block/internal/executing/... > block_executor_output.txt
48-
- name: Store Block Executor benchmark result
108+
# delete local gh-pages so the next benchmark action step fetches fresh from remote
109+
- name: Reset local gh-pages branch
110+
if: always()
111+
run: git branch -D gh-pages || true
112+
113+
- name: Store Block Executor result
114+
if: always()
49115
uses: benchmark-action/github-action-benchmark@4bdcce38c94cec68da58d012ac24b7b1155efe8b # v1.20.7
50116
with:
51117
name: Block Executor Benchmark
52118
tool: 'go'
53119
output-file-path: block_executor_output.txt
54-
auto-push: true
120+
auto-push: ${{ github.event_name != 'pull_request' }}
121+
save-data-file: ${{ github.event_name != 'pull_request' }}
55122
github-token: ${{ secrets.GITHUB_TOKEN }}
56123
alert-threshold: '150%'
57124
fail-on-alert: true
58125
comment-on-alert: true
126+
127+
# delete local gh-pages so the next benchmark action step fetches fresh from remote
128+
- name: Reset local gh-pages branch
129+
if: always()
130+
run: git branch -D gh-pages || true
131+
132+
- name: Store Spamoor Trace result
133+
if: always()
134+
uses: benchmark-action/github-action-benchmark@4bdcce38c94cec68da58d012ac24b7b1155efe8b # v1.20.7
135+
with:
136+
name: Spamoor Trace Benchmarks
137+
tool: 'customSmallerIsBetter'
138+
output-file-path: test/e2e/spamoor_bench.json
139+
auto-push: ${{ github.event_name != 'pull_request' }}
140+
save-data-file: ${{ github.event_name != 'pull_request' }}
141+
github-token: ${{ secrets.GITHUB_TOKEN }}
142+
alert-threshold: '150%'
143+
fail-on-alert: false
144+
comment-on-alert: true

‎.github/workflows/claude-code-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout repository
30-
uses: actions/checkout@v6
30+
uses: actions/checkout@v6.0.2
3131
with:
3232
fetch-depth: 1
3333

‎.github/workflows/claude.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
actions: read # Required for Claude to read CI results on PRs
2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v6
29+
uses: actions/checkout@v6.0.2
3030
with:
3131
fetch-depth: 1
3232

‎.github/workflows/dependabot-auto-fix.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,27 @@ jobs:
1414
if: github.actor == 'dependabot[bot]'
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v6
17+
- uses: actions/checkout@v6.0.2
1818
with:
1919
ref: ${{ github.head_ref }}
2020

21-
- uses: actions/setup-go@v6
21+
- uses: actions/setup-go@v6.2.0
2222
with:
23-
check-latest: true
23+
go-version-file: ./go.mod
2424

25-
- name: Install make (if missing)
26-
run: sudo apt-get update && sudo apt-get install -y make
25+
- name: Install just
26+
uses: extractions/setup-just@v3
2727

2828
- name: Run dependency update
29-
run: make deps
29+
run: just deps
3030

3131
- name: Commit and push changes
3232
run: |
3333
if [ -n "$(git status --porcelain)" ]; then
3434
git config user.name "github-actions[bot]"
3535
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
3636
git add -A
37-
git commit -m "chore: run make deps after Dependabot update"
37+
git commit -m "chore: run just deps after Dependabot update"
3838
git push
3939
else
4040
echo "No changes to commit."

‎.github/workflows/docker-build-push.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
app: ${{ fromJson(inputs.apps) }}
2929
steps:
3030
- name: Checkout code
31-
uses: actions/checkout@v6
31+
uses: actions/checkout@v6.0.2
3232

3333
- name: Set up Docker Buildx
3434
uses: docker/setup-buildx-action@v3

‎.github/workflows/docker-tests.yml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ jobs:
2222
name: Docker E2E Tests
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v6
25+
- uses: actions/checkout@v6.0.2
2626
- name: set up go
27-
uses: actions/setup-go@v6
27+
uses: actions/setup-go@v6.2.0
2828
with:
2929
go-version-file: ./test/docker-e2e/go.mod
30+
- name: Install just
31+
uses: extractions/setup-just@v3
3032
- name: Run Docker E2E Tests
31-
run: make test-docker-e2e
33+
run: just test-docker-e2e
3234
env:
3335
EV_NODE_IMAGE_REPO: ghcr.io/${{ github.repository_owner }}/ev-node-testapp
3436
EV_NODE_IMAGE_TAG: ${{ inputs.image-tag }}
@@ -39,13 +41,15 @@ jobs:
3941
contents: read
4042
runs-on: ubuntu-latest
4143
steps:
42-
- uses: actions/checkout@v6
44+
- uses: actions/checkout@v6.0.2
4345
- name: set up go
44-
uses: actions/setup-go@v6
46+
uses: actions/setup-go@v6.2.0
4547
with:
4648
go-version-file: ./test/docker-e2e/go.mod
49+
- name: Install just
50+
uses: extractions/setup-just@v3
4751
- name: Run Docker Upgrade E2E Tests
48-
run: make test-docker-upgrade-e2e
52+
run: just test-docker-upgrade-e2e
4953
env:
5054
EVM_IMAGE_REPO: ghcr.io/${{ github.repository_owner }}/ev-node-evm
5155
EVM_NODE_IMAGE_TAG: ${{ inputs.image-tag }}
@@ -56,13 +60,15 @@ jobs:
5660
contents: read
5761
runs-on: ubuntu-latest
5862
steps:
59-
- uses: actions/checkout@v6
63+
- uses: actions/checkout@v6.0.2
6064
- name: set up go
61-
uses: actions/setup-go@v6
65+
uses: actions/setup-go@v6.2.0
6266
with:
6367
go-version-file: ./test/docker-e2e/go.mod
68+
- name: Install just
69+
uses: extractions/setup-just@v3
6470
- name: Run Docker Compat E2E Tests
65-
run: make test-docker-compat
71+
run: just test-docker-compat
6672
env:
6773
SEQUENCER_EVM_IMAGE_REPO: ghcr.io/${{ github.repository_owner }}/ev-node-evm
6874
SEQUENCER_EVM_IMAGE_TAG: main # TODO: set this to the last released tag

‎.github/workflows/docs_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v6
19+
uses: actions/checkout@v6.0.2
2020
- name: Setup Node
2121
uses: actions/setup-node@v6
2222
with:

‎.github/workflows/docs_deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v6
28+
uses: actions/checkout@v6.0.2
2929
with:
3030
fetch-depth: 0 # Not needed if lastUpdated is not enabled
3131
# - uses: pnpm/action-setup@v2 # Uncomment this if you're using pnpm

‎.github/workflows/docs_preview.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
permissions: write-all
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v6
24+
uses: actions/checkout@v6.0.2
2525

2626
- name: Setup Node
2727
uses: actions/setup-node@v6

‎.github/workflows/lint.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
name: golangci-lint
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v6
16-
- uses: actions/setup-go@v6
15+
- uses: actions/checkout@v6.0.2
16+
- uses: actions/setup-go@v6.2.0
1717
with:
1818
go-version-file: ./go.mod
1919
# This steps sets the GIT_DIFF environment variable to true
@@ -36,7 +36,7 @@ jobs:
3636
hadolint:
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@v6
39+
- uses: actions/checkout@v6.0.2
4040
- uses: hadolint/hadolint-action@v3.3.0
4141
with:
4242
recursive: true
@@ -45,7 +45,7 @@ jobs:
4545
yamllint:
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@v6
48+
- uses: actions/checkout@v6.0.2
4949
with:
5050
fetch-depth: 0
5151
- uses: technote-space/get-diff-action@v6.1.2
@@ -59,7 +59,7 @@ jobs:
5959
markdown-lint:
6060
runs-on: ubuntu-latest
6161
steps:
62-
- uses: actions/checkout@v6
62+
- uses: actions/checkout@v6.0.2
6363
with:
6464
fetch-depth: 0
6565
- uses: technote-space/get-diff-action@v6.1.2
@@ -74,15 +74,15 @@ jobs:
7474
runs-on: ubuntu-latest
7575
steps:
7676
- name: checkout
77-
uses: actions/checkout@v6
77+
uses: actions/checkout@v6.0.2
7878
with:
7979
fetch-depth: 0
8080
- uses: technote-space/get-diff-action@v6.1.2
8181
with:
8282
PATTERNS: |
8383
.goreleaser.yaml
8484
.goreleaser.yml
85-
- uses: goreleaser/goreleaser-action@v6
85+
- uses: goreleaser/goreleaser-action@v7
8686
with:
8787
version: latest
8888
args: check

0 commit comments

Comments
 (0)