simplify

brndnmtthws · Jun 11, 2024 · d7d28c8 · d7d28c8
1 parent b771ec7
commit d7d28c8
Showing 1 changed file with 15 additions and 95 deletions.
diff --git a/.github/workflows/build-and-test-linux.yaml b/.github/workflows/build-and-test-linux.yaml
@@ -22,100 +22,14 @@ jobs:
     strategy:
       matrix:
         os:
-          # - ubuntu-20.04
-          # - ubuntu-22.04
+          - ubuntu-20.04
+          - ubuntu-22.04
           - ubuntu-24.04
         x11: [ON, OFF]
         wayland: [ON, OFF]
         compiler:
           - clang
           - gcc
-        compiler_version:
-          - 10
-          - 11
-          - 12
-          - 13
-          - 14
-          - 15
-          - 16
-          - 17
-          - 18
-        exclude:
-          # 15, 16, 17, 18 only exist for clang
-          - compiler: gcc
-            compiler_version: 15
-          - compiler: gcc
-            compiler_version: 16
-          - compiler: gcc
-            compiler_version: 17
-          - compiler: gcc
-            compiler_version: 18
-
-          # ubuntu-20.04
-          - os: ubuntu-20.04
-            compiler: gcc
-            compiler_version: 11
-          - os: ubuntu-20.04
-            compiler: gcc
-            compiler_version: 12
-          - os: ubuntu-20.04
-            compiler: gcc
-            compiler_version: 13
-          - os: ubuntu-20.04
-            compiler: gcc
-            compiler_version: 14
-          - os: ubuntu-20.04
-            compiler: clang
-            compiler_version: 13
-          - os: ubuntu-20.04
-            compiler: clang
-            compiler_version: 14
-          - os: ubuntu-20.04
-            compiler: clang
-            compiler_version: 15
-          - os: ubuntu-20.04
-            compiler: clang
-            compiler_version: 16
-          - os: ubuntu-20.04
-            compiler: clang
-            compiler_version: 17
-          - os: ubuntu-20.04
-            compiler: clang
-            compiler_version: 18
-
-          # ubuntu-22.04
-          - os: ubuntu-22.04
-            compiler: clang
-            compiler_version: 10
-          - os: ubuntu-22.04
-            compiler: clang
-            compiler_version: 11
-          - os: ubuntu-22.04
-            compiler: clang
-            compiler_version: 12
-          - os: ubuntu-22.04
-            compiler: clang
-            compiler_version: 13
-
-          # ubuntu-24.04
-          - os: ubuntu-24.04
-            compiler: gcc
-            compiler_version: 10
-          - os: ubuntu-24.04
-            compiler: gcc
-            compiler_version: 11
-          - os: ubuntu-24.04
-            compiler: clang
-            compiler_version: 10
-          - os: ubuntu-24.04
-            compiler: clang
-            compiler_version: 11
-          - os: ubuntu-24.04
-            compiler: clang
-            compiler_version: 12
-          - os: ubuntu-24.04
-            compiler: clang
-            compiler_version: 13
     runs-on: ${{ matrix.os }}
     steps:
       - run: sudo apt-get -qq update
@@ -156,22 +70,28 @@ jobs:
             ncurses-dev \
             ninja-build \
             wayland-protocols
-      - name: Install libc++
+      - name: Install clang and libc++
         if: matrix.compiler == 'clang'
         run: |
           sudo apt-get install -yqq --no-install-recommends \
-            libc++-${{ matrix.compiler_version }}-dev \
-            libc++abi-${{ matrix.compiler_version }}-dev
+            clang \
+            libc++-dev \
+            libc++abi-dev
+      - name: Install gcc
+        if: matrix.compiler == 'gcc'
+        run: |
+          sudo apt-get install -yqq --no-install-recommends \
+            gcc
       - name: Checkout
         uses: actions/checkout@v4
       - name: Configure with CMake
         run: |
           set -x # show the commands we're running
-          [[ "${{ matrix.compiler }}" == "clang"* ]] && CC=clang-${{ matrix.compiler_version }}
-          [[ "${{ matrix.compiler }}" == "clang"* ]] && CXX=clang++-${{ matrix.compiler_version }}
+          [[ "${{ matrix.compiler }}" == "clang"* ]] && CC=clang
+          [[ "${{ matrix.compiler }}" == "clang"* ]] && CXX=clang++
 
-          [[ "${{ matrix.compiler }}" == "gcc"* ]] && CC=gcc-${{ matrix.compiler_version }}
-          [[ "${{ matrix.compiler }}" == "gcc"* ]] && CXX=g++-${{ matrix.compiler_version }}
+          [[ "${{ matrix.compiler }}" == "gcc"* ]] && CC=gcc
+          [[ "${{ matrix.compiler }}" == "gcc"* ]] && CXX=g++
 
 
           # Enable librsvg by default, disable for older versions of Ubuntu