ci: deduplicate jobs

crytic · Jan 3, 2025 · 53015f2 · 53015f2
1 parent 6dff778
commit 53015f2
Showing 1 changed file with 15 additions and 69 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,87 +11,33 @@ on:
     - cron:  '0 12 * * *'
 
 jobs:
-  linux:
-    name: CI (Linux)
-    runs-on: ubuntu-latest
+  tests:
+    name: CI (Python ${{ matrix.python }} on ${{ matrix.os }}, ${{ matrix.type}} test)
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python:
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-          - "3.12"
-          - "3.13"
-        type: ["solc_upgrade", "linux", "solc"]
+        python: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        os: ["ubuntu-latest", "macos-latest", "windows-2022"]
+        include:
+          - type: "solc"
+          - type: "solc_upgrade"
+          - type: "linux"
+            os: "ubuntu-latest"
+          - type: "macos"
+            os: "macos-latest"
+          - type: "windows"
+            os: "windows-2022"
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python }}
     - name: Install solc-select
       run: |
-        sudo pip install .
+        ${{ (matrix.os != 'windows-2022' && 'sudo pip install .') || 'pip install . --user' }}
         solc-select install all
     - name: Run Tests
       env:
         TEST_TYPE: ${{ matrix.type }}
       run: |
         bash scripts/test_${TEST_TYPE}.sh
-
-  macos:
-    name: CI (macOS)
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        python:
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-          - "3.12"
-          - "3.13"
-        type: ["solc_upgrade", "macos", "solc"]
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python }}
-    - name: Install solc-select
-      run: |
-        sudo pip install .
-        solc-select install all
-    - name: Run Tests
-      env:
-        TEST_TYPE: ${{ matrix.type }}
-      run: |
-        bash scripts/test_${TEST_TYPE}.sh
-
-  windows:
-    name: CI (Windows)
-    runs-on: windows-2022
-    strategy:
-      matrix:
-        python:
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-          - "3.12"
-          - "3.13"
-        type: ["windows", "solc"]
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python }}
-    - name: Install solc-select
-      run: |
-        pip install . --user
-        solc-select install all
-    - name: Run Tests
-      env:
-        TEST_TYPE: ${{ matrix.type }}
-      run: |
-        bash scripts/test_${TEST_TYPE}.sh
-      shell: bash