Skip to content

Commit

Permalink
fix(ci): use local eels (ethereum#997)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
danceratopz authored Dec 5, 2024
1 parent ed433a7 commit 2c5c008
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 2 deletions.
36 changes: 36 additions & 0 deletions .github/configs/eels_resolutions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"EELSMaster": {
"git_url": "https://github.com/ethereum/execution-specs.git",
"branch": "master"
},
"Frontier": {
"path": "../../execution-specs/src/ethereum/frontier"
},
"Homestead": {
"path": "../../execution-specs/src/ethereum/homestead"
},
"Byzantium": {
"path": "../../execution-specs/src/ethereum/byzantium"
},
"ConstantinopleFix": {
"path": "../../execution-specs/src/ethereum/constantinople"
},
"Istanbul": {
"path": "../../execution-specs/src/ethereum/istanbul"
},
"Berlin": {
"path": "../../execution-specs/src/ethereum/berlin"
},
"London": {
"path": "../../execution-specs/src/ethereum/london"
},
"Paris": {
"path": "../../execution-specs/src/ethereum/paris"
},
"Shanghai": {
"path": "../../execution-specs/src/ethereum/shanghai"
},
"Cancun": {
"path": "../../execution-specs/src/ethereum/cancun"
}
}
14 changes: 12 additions & 2 deletions .github/workflows/tox_verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,17 @@ jobs:
evm-type: "stable"
tox-cmd: "uvx --with=tox-uv tox" # run-parallel --parallel-no-spinner"
steps:
- uses: actions/checkout@v4
- name: Checkout ethereum/execution-spec-tests
uses: actions/checkout@v4
- name: Checkout ethereum/execution-specs
uses: actions/checkout@v4
with:
submodules: true
repository: ethereum/execution-specs
ref: 9b95554a88d2a8485f8180254d0f6a493a593fda
path: execution-specs
sparse-checkout: |
src/ethereum
fetch-depth: 1
- uses: ./.github/actions/build-evm-base
id: evm-builder
with:
Expand All @@ -54,6 +62,8 @@ jobs:
# Add additional packages on 3.11: https://github.com/ethereum/execution-spec-tests/issues/274
if [ ${{ matrix.python }} == '3.11' ]; then brew install autoconf automake libtool; fi
- name: Run Tox (CPython)
env:
EELS_RESOLUTIONS_FILE: ${{ github.workspace }}/.github/configs/eels_resolutions.json
run: ${{ matrix.tox-cmd }}
- uses: DavidAnson/markdownlint-cli2-action@v16
with:
Expand Down
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Test fixtures for use by clients are available for each release on the [Github r
- 🔀 Move pytest plugin `pytest_plugins.filler.solc` to `pytest_plugins.solc.solc` ([#823](https://github.com/ethereum/execution-spec-tests/pull/823)).
- 🐞 Asserts that the deploy docs tags workflow is only triggered for full releases ([#857](https://github.com/ethereum/execution-spec-tests/pull/857)).
- ✨ A new application-wide configuration manager provides access to environment and application configurations. ([#892](https://github.com/ethereum/execution-spec-tests/pull/892)).
- 🐞 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)).

### 💥 Breaking Change

Expand Down
4 changes: 4 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ wheel_build_env = .pkg
[testenv:framework]
description = Run checks on helper libraries and test framework

setenv =
# Only use EELS_RESOLUTIONS_FILE if it is set in the environment (eg, in CI)
EELS_RESOLUTIONS_FILE = {env:EELS_RESOLUTIONS_FILE:}

extras =
test
lint
Expand Down

0 comments on commit 2c5c008

Please sign in to comment.