feat(ci): update and fix workflows.

ethereum · Mar 4, 2024 · 6ebe1a8 · 6ebe1a8
1 parent 98e734f
commit 6ebe1a8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 32 deletions.
diff --git a/.github/workflows/fixtures.yaml b/.github/workflows/fixtures.yaml
@@ -17,13 +17,11 @@ jobs:
           - name: 'fixtures'
             evm-type: 'main'
             fill-params: ''
-            solc: '0.8.21'
-            python: '3.11'
+            python: '3.12'
           - name: 'fixtures_develop'
             evm-type: 'develop'
             fill-params: '--until=Cancun'
-            solc: '0.8.21'
-            python: '3.11'
+            python: '3.12'
     steps:
       - uses: actions/checkout@v3
         with:
@@ -36,21 +34,11 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
-      - name: Install solc compiler
-        shell: bash
-        run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then PLATFORM="linux-amd64"; else PLATFORM="macosx-amd64"; fi
-          RELEASE_NAME=$(curl https://binaries.soliditylang.org/${PLATFORM}/list.json | jq -r --arg SOLC_VERSION "${{ matrix.solc }}" '.releases[$SOLC_VERSION]')
-          wget -O $GITHUB_WORKSPACE/bin/solc https://binaries.soliditylang.org/${PLATFORM}/$RELEASE_NAME
-          chmod a+x $GITHUB_WORKSPACE/bin/solc
-          echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH
       - name: Run fixtures fill
         shell: bash
         run: |
-          pip install --upgrade pip
-          python -m venv env
+          python src/entry_points/eest_utils.py init
           source env/bin/activate
-          pip install -e .
           fill ${{ matrix.fill-params }}
       - name: Create fixtures info file
         shell: bash

diff --git a/.github/workflows/test.yaml → .github/workflows/tox.yaml b/.github/workflows/test.yaml → .github/workflows/tox.yaml
@@ -10,22 +10,18 @@ jobs:
         include:
           - os: ubuntu-latest
             python: '3.10'
-            solc: '0.8.20'
-            evm-type: 'main'
-            tox-cmd: 'tox run-parallel --parallel-no-spinner'
-          - os: ubuntu-latest
-            python: '3.12'
-            solc: '0.8.23'
             evm-type: 'main'
             tox-cmd: 'tox run-parallel --parallel-no-spinner'
           - os: ubuntu-latest
             python: '3.11'
-            solc: '0.8.21'
             evm-type: 'develop'
             tox-cmd: 'tox -e tests-develop'
+          - os: ubuntu-latest
+            python: '3.12'
+            evm-type: 'main'
+            tox-cmd: 'tox run-parallel --parallel-no-spinner'
           - os: macos-latest
             python: '3.11'
-            solc: '0.8.22'
             evm-type: 'main'
             tox-cmd: 'tox run-parallel --parallel-no-spinner'
     steps:
@@ -41,13 +37,6 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
           allow-prereleases: true
-      - name: Install solc compiler
-        run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then PLATFORM="linux-amd64"; else PLATFORM="macosx-amd64"; fi
-          RELEASE_NAME=$(curl https://binaries.soliditylang.org/${PLATFORM}/list.json | jq -r --arg SOLC_VERSION "${{ matrix.solc }}" '.releases[$SOLC_VERSION]')
-          wget -O $GITHUB_WORKSPACE/bin/solc https://binaries.soliditylang.org/${PLATFORM}/$RELEASE_NAME
-          chmod a+x $GITHUB_WORKSPACE/bin/solc
-          echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH
       - name: Setup Tools/Dependencies Ubuntu
         if: runner.os == 'Linux'
         run: |

diff --git a/tox.ini b/tox.ini
@@ -22,12 +22,12 @@ extras =
 src = src setup.py
 
 commands =
-    solc-select use latest --always-install
     fname8 {[testenv:framework]src}
     isort {[testenv:framework]src} --check --diff
     black {[testenv:framework]src} --check --diff
     flake8 {[testenv:framework]src}
     mypy {[testenv:framework]src}
+    solc-select use latest --always-install
     pytest -c ./pytest-framework.ini -n auto
 
 [testenv:py3]
@@ -43,7 +43,6 @@ extras =
     lint
 
 commands =
-    solc-select use latest --always-install
     fname8 tests
     isort tests --check --diff
     black tests --check --diff
@@ -58,6 +57,7 @@ extras =
 
 commands =
     {[testenv:tests-base]commands}
+    solc-select use latest --always-install
     pytest -n auto
 
 [testenv:tests-develop]
@@ -67,6 +67,7 @@ extras =
     {[testenv:tests-base]extras}
 
 commands =
+    solc-select use latest --always-install
     pytest -n auto --until={[main]development_fork}
 
 [testenv:docs]