Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: test combinations check #330

Merged
merged 7 commits into from
Oct 23, 2024
Merged

ci: test combinations check #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c10899e
ci: test combinations check
leovct Oct 23, 2024
e3271ec
fix: typo
leovct Oct 23, 2024
8c43ee0
ci: rename jobs
leovct Oct 23, 2024
fe730b7
chore: update test combinations
leovct Oct 23, 2024
edf4a46
fix: install yq
leovct Oct 23, 2024
15a39e7
test
leovct Oct 23, 2024
8a89c1b
Revert "test"
leovct Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.2-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:acceptance-2.0.0-beta26-0f01107
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.3-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
additional_services:
- tx_spammer
data_availability_mode: rollup
Expand Down
6 changes: 3 additions & 3 deletions .github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.2-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:acceptance-2.0.0-beta26-0f01107
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.3-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
additional_services:
- tx_spammer
data_availability_mode: cdk-validium
Expand Down
6 changes: 3 additions & 3 deletions .github/tests/combinations/fork11-new-cdk-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.2-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:acceptance-2.0.0-beta26-0f01107
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.3-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
additional_services:
- tx_spammer
data_availability_mode: rollup
Expand Down
4 changes: 2 additions & 2 deletions .github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.4-fork.12
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12
cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC13-fork.12
cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
additional_services:
- tx_spammer
data_availability_mode: cdk-validium
Expand Down
4 changes: 2 additions & 2 deletions .github/tests/combinations/fork12-new-cdk-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.4-fork.12
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12
cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC13-fork.12
cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
additional_services:
- tx_spammer
data_availability_mode: rollup
Expand Down
6 changes: 3 additions & 3 deletions .github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
additional_services:
- pless_zkevm_node
Expand Down
6 changes: 3 additions & 3 deletions .github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
additional_services:
- pless_zkevm_node
Expand Down
6 changes: 3 additions & 3 deletions .github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
additional_services:
- pless_zkevm_node
Expand Down
6 changes: 3 additions & 3 deletions .github/tests/combinations/fork9-new-cdk-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
args:
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
additional_services:
- pless_zkevm_node
Expand Down
27 changes: 26 additions & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
KURTOSIS_VERSION: 0.90.1

jobs:
check:
lint:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
Expand Down Expand Up @@ -51,3 +51,28 @@ jobs:

- name: Run shellcheck
run: find . -type f -name '*.sh' | sort | xargs -I {} shellcheck {}

check-test-combinations:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Install yq
run: |
pip3 install yq
yq --version
- name: Generate test combinations
working-directory: .github/tests
run: ./combine-ymls.sh

- name: Check if test combinations are up to date
run: |
if [[ -n $(git status --porcelain) ]]; then
echo "❌ Error: Test combinations are not up to date. Please run \`./combine-ymls.sh\`."
git status --porcelain
git diff
exit 1
else
echo "✅ Test combinations are up to date."
fi