Skip to content

Commit 1e0286c

Browse files
Merge branch 'arith-dev' into 1514-call-exceptions-testing
2 parents 503455c + ffd428f commit 1e0286c

File tree

224 files changed

+4241
-1478
lines changed

Some content is hidden

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

224 files changed

+4241
-1478
lines changed
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: 'Setup Testing Environment'
2+
description: 'Checkout repository and install what is needed for building / testing'
3+
inputs:
4+
enable-ssh:
5+
description: 'Enable ability to ssh into session'
6+
required: false
7+
default: false
8+
rust-corset:
9+
description: 'Setup Rust Corset'
10+
required: false
11+
default: false
12+
go-corset:
13+
description: 'Setup Go Corset'
14+
required: false
15+
default: false
16+
github-token:
17+
description: 'Github token (needed for downloading corset)'
18+
required: false
19+
20+
runs:
21+
using: 'composite'
22+
steps:
23+
- name: Setup upterm session
24+
if: ${{ inputs.enable-ssh == 'true' }}
25+
uses: lhotari/action-upterm@v1
26+
27+
- name: Install Go
28+
uses: actions/setup-go@v4
29+
30+
- name: Get Submodules
31+
shell: bash
32+
run: git submodule update --init --recursive linea-constraints
33+
34+
- name: Set up JDK 21
35+
uses: actions/setup-java@v3
36+
with:
37+
java-version: 21
38+
distribution: temurin
39+
40+
- name: Setup Rust Corset
41+
if: ${{ inputs.rust-corset == 'true' }}
42+
uses: ./.github/actions/setup-rust-corset
43+
with:
44+
github-token: ${{ inputs.github-token }}
45+
46+
- name: Setup Go Corset
47+
if: ${{ inputs.go-corset == 'true' }}
48+
uses: ./.github/actions/setup-go-corset
Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,51 @@
11
name: 'Setup rust corset'
22
description: 'Install rust and rust corset'
3+
inputs:
4+
build:
5+
description: 'Build Corset from Scratch'
6+
required: false
7+
default: true
8+
version:
9+
# Corresponds to the corset release tag for the desired version.
10+
description: 'Corset tag to use'
11+
required: false
12+
default: 'v9.7.17'
13+
asset_id:
14+
# Corresponds to the Github asset id for the asset published as part
15+
# of the release. Specifically, it should be the id for the asset
16+
# "corset_vX.Y.Z_x86_64-unknown-linux-musl.tar.gz" where X.Y.Z is
17+
# the desired version. To figure out the asset id, you'll need to
18+
# access the Github API via e.g. curl --- google it :)
19+
description: 'Github asset id to use (when downloading)'
20+
required: false
21+
default: '203897668'
22+
github-token:
23+
description: 'Github token (needed for download)'
24+
required: false
325

426
runs:
527
using: 'composite'
628
steps:
29+
- name: Download Corset
30+
shell: bash
31+
if: ${{ inputs.build != 'true' }}
32+
run: |
33+
curl -L \
34+
-H "Accept: application/octet-stream" \
35+
-H "Authorization: Bearer ${{ inputs.github_token }}" \
36+
-H "X-GitHub-Api-Version: 2022-11-28" \
37+
-o corset.tar.gz \
38+
https://api.github.com/repos/Consensys/corset/releases/assets/${{ inputs.assert_id }}
39+
tar xzf corset.tar.gz
40+
mv corset $HOME
41+
742
- name: Install Rust
43+
if: ${{ inputs.build == 'true' }}
844
uses: actions-rust-lang/setup-rust-toolchain@v1
945

10-
- name: Install Corset
46+
- name: Build & Install Corset
47+
if: ${{ inputs.build == 'true' }}
1148
shell: bash
12-
run: RUSTFLAGS=-Awarnings cargo install --git https://github.com/Consensys/corset.git --tag v9.7.17 --locked --force
49+
run: RUSTFLAGS=-Awarnings cargo install --git https://github.com/Consensys/corset.git --tag ${{ inputs.version }} --locked --force
50+
env:
51+
CARGO_NET_GIT_FETCH_WITH_CLI: true

.github/workflows/gradle-ethereum-tests.yml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
1-
name: reference tests
1+
name: Daily State Tests
22

33
on:
44
schedule:
55
- cron: "0 23 * * 1-5"
66
workflow_dispatch:
77

8-
env:
9-
CARGO_NET_GIT_FETCH_WITH_CLI: true
10-
118
jobs:
129
ethereum-tests:
13-
runs-on: ubuntu-latest-128
10+
runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xxl
1411
steps:
1512
- name: Checkout repository
1613
uses: actions/checkout@v3
1714
with:
1815
submodules: recursive
1916

20-
- name: Set up JDK 21
21-
uses: actions/setup-java@v3
17+
- name: Setup Test Environment
18+
uses: ./.github/actions/setup-environment
2219
with:
23-
java-version: 21
24-
distribution: temurin
25-
26-
- name: Setup Rust Corset
27-
uses: ./.github/actions/setup-rust-corset
20+
rust-corset: true
2821

2922
- name: Generate zkevm_for_reference_tests.bin
3023
run: cd ./linea-constraints; make zkevm_for_reference_tests.bin -B; cd ..
@@ -58,25 +51,21 @@ jobs:
5851
webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
5952
webhook-type: webhook-trigger
6053
payload: |
61-
name: "Daily Reference Tests (Rust Corset)"
54+
name: "Daily State Tests (Rust Corset)"
6255
status: "${{ job.status }}"
6356
6457
ethereum-tests-go-corset:
65-
runs-on: ubuntu-latest-128
58+
runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xxl
6659
steps:
6760
- name: Checkout repository
6861
uses: actions/checkout@v3
6962
with:
7063
submodules: recursive
7164

72-
- name: Set up JDK 21
73-
uses: actions/setup-java@v3
65+
- name: Setup Test Environment
66+
uses: ./.github/actions/setup-environment
7467
with:
75-
java-version: 21
76-
distribution: temurin
77-
78-
- name: Setup Go Corset
79-
uses: ./.github/actions/setup-go-corset
68+
go-corset: true
8069

8170
- name: Generate zkevm_for_reference_tests.bin
8271
run: cd ./linea-constraints; make zkevm_for_reference_tests.bin -B; cd ..
@@ -110,5 +99,5 @@ jobs:
11099
webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
111100
webhook-type: webhook-trigger
112101
payload: |
113-
name: "Daily Reference Tests (Go Corset)"
102+
name: "Daily State (Go Corset)"
114103
status: "${{ job.status }}"

.github/workflows/gradle-nightly-tests.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,22 @@ on:
55
- cron: "0 22 * * 1-5"
66
workflow_dispatch:
77

8-
env:
9-
CARGO_NET_GIT_FETCH_WITH_CLI: true
10-
118
jobs:
129
nightly-tests:
13-
runs-on: ubuntu-latest-128
10+
runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xxl
1411
steps:
1512
- name: Checkout repository
1613
uses: actions/checkout@v3
1714
with:
1815
submodules: recursive
1916

20-
- name: Set up JDK 21
21-
uses: actions/setup-java@v3
17+
- name: Setup Test Environment
18+
uses: ./.github/actions/setup-environment
2219
with:
23-
java-version: 21
24-
distribution: temurin
25-
26-
- name: Setup Go Corset
27-
uses: ./.github/actions/setup-go-corset
20+
go-corset: true
2821

2922
- name: Run Nightly tests
30-
run: GOMEMLIMIT=100GiB ./gradlew nightlyTests
23+
run: GOMEMLIMIT=96GiB ./gradlew nightlyTests
3124
env:
3225
JAVA_OPTS: -Dorg.gradle.daemon=false
3326
CORSET_FLAGS: disable

0 commit comments

Comments
 (0)