Skip to content

Commit 2c5c008

Browse files
authored
fix(ci): use local eels (#997)
* chore(ci): remove checkout submodule init for eest EEST doesn't have any submodules. * chore(ci): use a local eels checkout for framework tests * docs: update changelog
1 parent ed433a7 commit 2c5c008

File tree

4 files changed

+53
-2
lines changed

4 files changed

+53
-2
lines changed
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"EELSMaster": {
3+
"git_url": "https://github.com/ethereum/execution-specs.git",
4+
"branch": "master"
5+
},
6+
"Frontier": {
7+
"path": "../../execution-specs/src/ethereum/frontier"
8+
},
9+
"Homestead": {
10+
"path": "../../execution-specs/src/ethereum/homestead"
11+
},
12+
"Byzantium": {
13+
"path": "../../execution-specs/src/ethereum/byzantium"
14+
},
15+
"ConstantinopleFix": {
16+
"path": "../../execution-specs/src/ethereum/constantinople"
17+
},
18+
"Istanbul": {
19+
"path": "../../execution-specs/src/ethereum/istanbul"
20+
},
21+
"Berlin": {
22+
"path": "../../execution-specs/src/ethereum/berlin"
23+
},
24+
"London": {
25+
"path": "../../execution-specs/src/ethereum/london"
26+
},
27+
"Paris": {
28+
"path": "../../execution-specs/src/ethereum/paris"
29+
},
30+
"Shanghai": {
31+
"path": "../../execution-specs/src/ethereum/shanghai"
32+
},
33+
"Cancun": {
34+
"path": "../../execution-specs/src/ethereum/cancun"
35+
}
36+
}

.github/workflows/tox_verify.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,17 @@ jobs:
3232
evm-type: "stable"
3333
tox-cmd: "uvx --with=tox-uv tox" # run-parallel --parallel-no-spinner"
3434
steps:
35-
- uses: actions/checkout@v4
35+
- name: Checkout ethereum/execution-spec-tests
36+
uses: actions/checkout@v4
37+
- name: Checkout ethereum/execution-specs
38+
uses: actions/checkout@v4
3639
with:
37-
submodules: true
40+
repository: ethereum/execution-specs
41+
ref: 9b95554a88d2a8485f8180254d0f6a493a593fda
42+
path: execution-specs
43+
sparse-checkout: |
44+
src/ethereum
45+
fetch-depth: 1
3846
- uses: ./.github/actions/build-evm-base
3947
id: evm-builder
4048
with:
@@ -54,6 +62,8 @@ jobs:
5462
# Add additional packages on 3.11: https://github.com/ethereum/execution-spec-tests/issues/274
5563
if [ ${{ matrix.python }} == '3.11' ]; then brew install autoconf automake libtool; fi
5664
- name: Run Tox (CPython)
65+
env:
66+
EELS_RESOLUTIONS_FILE: ${{ github.workspace }}/.github/configs/eels_resolutions.json
5767
run: ${{ matrix.tox-cmd }}
5868
- uses: DavidAnson/markdownlint-cli2-action@v16
5969
with:

docs/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ Test fixtures for use by clients are available for each release on the [Github r
7575
- 🔀 Move pytest plugin `pytest_plugins.filler.solc` to `pytest_plugins.solc.solc` ([#823](https://github.com/ethereum/execution-spec-tests/pull/823)).
7676
- 🐞 Asserts that the deploy docs tags workflow is only triggered for full releases ([#857](https://github.com/ethereum/execution-spec-tests/pull/857)).
7777
- ✨ A new application-wide configuration manager provides access to environment and application configurations. ([#892](https://github.com/ethereum/execution-spec-tests/pull/892)).
78+
- 🐞 Use a local version of ethereum/execution-specs (EELS) when running the framework tests in CI ([#997](https://github.com/ethereum/execution-spec-tests/pull/997)).
7879

7980
### 💥 Breaking Change
8081

tox.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ wheel_build_env = .pkg
1616
[testenv:framework]
1717
description = Run checks on helper libraries and test framework
1818

19+
setenv =
20+
# Only use EELS_RESOLUTIONS_FILE if it is set in the environment (eg, in CI)
21+
EELS_RESOLUTIONS_FILE = {env:EELS_RESOLUTIONS_FILE:}
22+
1923
extras =
2024
test
2125
lint

0 commit comments

Comments
 (0)