Explicit build permutations, add GCC 13 (or maybe 14).

CesiumGS · Nov 25, 2024 · 10bbed3 · 10bbed3
1 parent 3b4363b
commit 10bbed3
Showing 1 changed file with 33 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -75,17 +75,36 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ gcc, clang ]
-        platform: [ ubuntu-22.04, ubuntu-20.04, macos-15 ]
-        build_type: [Debug, RelWithDebInfo]
-        exclude:
-          - compiler: clang
-            platform: ubuntu-22.04
-          - compiler: gcc
-            platform: macos-15
-          - compiler: gcc
-            platform: ubuntu-20.04
-    name: "${{matrix.platform}} / ${{matrix.compiler}} / ${{matrix.build_type}}"
+        include:
+          - platform: ubuntu-20.04
+            build_type: Debug
+            compiler-cc: clang-12
+            compiler-cxx: clang++-12
+          - platform: ubuntu-20.04
+            build_type: RelWithDebInfo
+            compiler-cc: clang-12
+            compiler-cxx: clang++-12
+          - platform: ubuntu-22.04
+            build_type: Debug
+            compiler-cc: gcc
+            compiler-cxx: g++
+          - platform: ubuntu-22.04
+            build_type: RelWithDebInfo
+            compiler-cc: gcc
+            compiler-cxx: g++
+          - platform: ubuntu-24.04
+            build_type: Debug
+            compiler-cc: gcc
+            compiler-cxx: g++
+          - platform: ubuntu-24.04
+            build_type: RelWithDebInfo
+            compiler-cc: gcc
+            compiler-cxx: g++
+          - platform: macos-15
+            build_type: Debug
+          - platform: macos-15
+            build_type: RelWithDebInfo
+    name: "${{matrix.platform}} / ${{matrix.compiler-cc}} / ${{matrix.build_type}}"
     env:
       CACHE_KEY: "${{ matrix.platform }}-${{matrix.compiler}}"
     runs-on: ${{ matrix.platform }}
@@ -111,10 +130,10 @@ jobs:
             vcpkg-${{ env.CACHE_KEY }}-${{ hashFiles('CMakeLists.txt') }}
             vcpkg-${{ env.CACHE_KEY }}
       - name: Set CC and CXX
-        if: ${{ matrix.compiler == 'clang' && matrix.platform != 'macos-15'}}
+        if: ${{ matrix.compiler-cc }}
         run: |
-          echo "CC=clang-12" >> "$GITHUB_ENV"
-          echo "CXX=clang++-12" >> "$GITHUB_ENV"
+          echo "CC=${{ matrix.compiler-cc }}" >> "$GITHUB_ENV"
+          echo "CXX=${{ matrix.compiler-cxx }}" >> "$GITHUB_ENV"
       - name: Make more swap space available
         if: ${{ matrix.platform != 'macos-15'}}
         run: |