More fighting with github actions

rHermes · Apr 4, 2024 · 2d7b319 · 2d7b319
1 parent 7c56f0c
commit 2d7b319
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -25,32 +25,28 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         build_type: [Release]
-        c_compiler: [gcc, clang, cl]
+        cpp_compiler: [g++-13, clang++-15, cl]
         include:
           - os: windows-latest
             c_compiler: cl
             cpp_compiler: cl
           - os: ubuntu-latest
-            c_compiler: gcc
-            cpp_compiler: g++
+            c_compiler: gcc-13
+            cpp_compiler: g++-13
           - os: ubuntu-latest
-            c_compiler: clang
-            cpp_compiler: clang++
+            c_compiler: clang-15
+            cpp_compiler: clang++-15
         exclude:
           - os: windows-latest
-            c_compiler: gcc
+            cpp_compiler: g++-13
           - os: windows-latest
-            c_compiler: clang
+            cpp_compiler: clang++-15
           - os: ubuntu-latest
-            c_compiler: cl
+            cpp_compiler: cl
 
     steps:
     - uses: actions/checkout@v3
 
-    - uses: mjp41/workaround8649@c8550b715ccdc17f89c8d5c28d7a48eeff9c94a8
-      with:
-        os: ${{ matrix.os }}
-
     - name: Set reusable strings
       # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
       id: strings