From 2ff923a243e65e01c8b8ae7ad754329f952f891a 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:14:46 +0100
Subject: [PATCH] ci: unify CI workflows

---
 .github/workflows/ci.yml         | 97 ++++++++++++++++++++++++++++++++
 .github/workflows/linux-ci.yml   | 39 -------------
 .github/workflows/mac-ci.yml     | 39 -------------
 .github/workflows/windows-ci.yml | 40 -------------
 4 files changed, 97 insertions(+), 118 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .github/workflows/linux-ci.yml
 delete mode 100644 .github/workflows/mac-ci.yml
 delete mode 100644 .github/workflows/windows-ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..15e9f95
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,97 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+      - dev
+  pull_request:
+  schedule:
+    # run CI every day even if no PRs/merges occur
+    - cron:  '0 12 * * *'
+
+jobs:
+  linux:
+    name: CI (Linux)
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
+        type: ["solc_upgrade", "linux", "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
+
+  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/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
deleted file mode 100644
index ffe2c14..0000000
--- a/.github/workflows/linux-ci.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - master
-      - dev
-  pull_request:
-  schedule:
-    # run CI every day even if no PRs/merges occur
-    - cron:  '0 12 * * *'
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python:
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-          - "3.12"
-          - "3.13"
-        type: ["solc_upgrade", "linux", "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
\ No newline at end of file
diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml
deleted file mode 100644
index d566963..0000000
--- a/.github/workflows/mac-ci.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - master
-      - dev
-  pull_request:
-  schedule:
-    # run CI every day even if no PRs/merges occur
-    - cron:  '0 12 * * *'
-
-jobs:
-  tests:
-    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
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
deleted file mode 100644
index c4f1c7f..0000000
--- a/.github/workflows/windows-ci.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - master
-      - dev
-  pull_request:
-  schedule:
-    # run CI every day even if no PRs/merges occur
-    - cron:  '0 12 * * *'
-
-jobs:
-  tests:
-    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