Skip to content

Commit 9786d5a

Browse files
authored
feat(ci): use solc-select for tox (#604)
* feat(ci): use solc-select for tox. * chore(docs): update changelog for solc-select with tox.
1 parent ab46fff commit 9786d5a

File tree

4 files changed

+5
-12
lines changed

4 files changed

+5
-12
lines changed

.github/workflows/tox_verify.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,23 @@ jobs:
1010
include:
1111
- os: ubuntu-latest
1212
python: '3.10'
13-
solc: '0.8.20'
1413
evm-type: 'stable'
1514
tox-cmd: 'tox run-parallel --parallel-no-spinner'
1615
- os: ubuntu-latest
1716
python: '3.12'
18-
solc: '0.8.23'
1917
evm-type: 'stable'
2018
tox-cmd: 'tox run-parallel --parallel-no-spinner'
2119
- os: ubuntu-latest
2220
python: '3.11'
23-
solc: '0.8.21'
2421
evm-type: 'develop'
2522
tox-cmd: 'tox -e tests-develop'
2623
# Disabled to not be gated by evmone implementation
2724
# - os: ubuntu-latest
2825
# python: '3.11'
29-
# solc: '0.8.21'
3026
# evm-type: 'eip7692'
3127
# tox-cmd: 'tox -e tests-eip7692'
3228
- os: macos-latest
3329
python: '3.11'
34-
solc: '0.8.22'
3530
evm-type: 'stable'
3631
tox-cmd: 'tox run-parallel --parallel-no-spinner'
3732
steps:
@@ -47,13 +42,6 @@ jobs:
4742
with:
4843
python-version: ${{ matrix.python }}
4944
allow-prereleases: true
50-
- name: Install solc compiler
51-
run: |
52-
if [ "$RUNNER_OS" == "Linux" ]; then PLATFORM="linux-amd64"; else PLATFORM="macosx-amd64"; fi
53-
RELEASE_NAME=$(curl https://binaries.soliditylang.org/${PLATFORM}/list.json | jq -r --arg SOLC_VERSION "${{ matrix.solc }}" '.releases[$SOLC_VERSION]')
54-
wget -O $GITHUB_WORKSPACE/bin/solc https://binaries.soliditylang.org/${PLATFORM}/$RELEASE_NAME
55-
chmod a+x $GITHUB_WORKSPACE/bin/solc
56-
echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH
5745
- name: Setup Tools/Dependencies Ubuntu
5846
if: runner.os == 'Linux'
5947
run: |

docs/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Test fixtures for use by clients are available for each release on the [Github r
5252
- 🐞 Relax minor and patch dependency requirements to avoid conflicting package dependencies ([#510](https://github.com/ethereum/execution-spec-tests/pull/510)).
5353
- 🔀 Update all CI actions to use their respective Node.js 20 versions, ahead of their Node.js 16 version deprecations ([#527](https://github.com/ethereum/execution-spec-tests/pull/527)).
5454
- ✨ Releases now contain a `fixtures_eip7692.tar.gz` which contains all EOF fixtures ([#573](https://github.com/ethereum/execution-spec-tests/pull/573)).
55+
- ✨ Use `solc-select` for tox when running locally and within CI ([#604](https://github.com/ethereum/execution-spec-tests/pull/604)).
5556

5657
### 💥 Breaking Change
5758

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ install_requires =
4444
click>=8.0.0,<9
4545
pydantic>=2.6.3,<3
4646
rich>=13.7.0,<14
47+
solc-select>=1.0.4
4748

4849
[options.package_data]
4950
ethereum_test_tools =

tox.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ eip7692 = CancunEIP7692
1111
[testenv]
1212
package = wheel
1313
wheel_build_env = .pkg
14+
commands_pre = solc-select use 0.8.24 --always-install
1415

1516
[testenv:framework]
1617
description = Run checks on helper libraries and test framework
@@ -83,6 +84,8 @@ extras =
8384
lint
8485
docs
8586

87+
commands_pre = # Override commands pre to not run solc-select install
88+
8689
setenv =
8790
SPEC_TESTS_AUTO_GENERATE_FILES = true
8891
# Required for `cairosvg` so tox can find `libcairo-2`.

0 commit comments

Comments
 (0)