Skip to content

fix(ci): use local eels #997

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.

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

Merged
merged 3 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
Loading