From 69be6e73ae19034a49a49947b553d010b2959425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio.lopez@trailofbits.com>
Date: Fri, 3 Jan 2025 13:28:46 +0100
Subject: [PATCH] ci: deduplicate jobs

---
 .github/workflows/ci.yml | 82 ++++++----------------------------------
 scripts/test_solc.sh     |  4 +-
 2 files changed, 14 insertions(+), 72 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 15e9f95..f7c84ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,19 +11,17 @@ 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 }}
+    defaults:
+      run:
+        shell: bash
     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"]
+        type: ["solc", "solc_upgrade", "os_specific"]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
@@ -31,67 +29,11 @@ jobs:
         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 }}
+        TEST_TYPE: ${{ (matrix.type != 'os_specific' && matrix.type) || runner.os }}
       run: |
+        TEST_TYPE="$(echo "$TEST_TYPE" | tr '[:upper:]' '[:lower:]')"
         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
diff --git a/scripts/test_solc.sh b/scripts/test_solc.sh
index db20a04..6e328cd 100644
--- a/scripts/test_solc.sh
+++ b/scripts/test_solc.sh
@@ -91,7 +91,7 @@ fi
 echo "SUCCESS: solc080_fail_compile"
 
 UNINSTALL_PATH=$HOME/.solc-select/artifacts/solc-0.8.9
-rm -rf $UNINSTALL_PATH # uninstall solc 0.8.9
+rm -rf $UNINSTALL_PATH{,.exe} # uninstall solc 0.8.9
 execute=$(solc-select use 0.8.9 --always-install)
 if [[ "$execute" != *"Switched global version to 0.8.9"* ]]; then
   echo "FAILED: use - always install"
@@ -100,7 +100,7 @@ fi
 echo "SUCCESS: use - always install"
 
 UNINSTALL_PATH=$HOME/.solc-select/artifacts/solc-0.8.1
-rm -rf $UNINSTALL_PATH # uninstall solc 0.8.1
+rm -rf $UNINSTALL_PATH{,.exe} # uninstall solc 0.8.1
 execute=$(solc-select use 0.8.1 2>&1 || true)
 if [[ $execute != *"'0.8.1' must be installed prior to use"* ]]; then
   echo "FAILED: use - no install"