Merge pull request #16 from KredeGC/workflow-fix

Fix clang workflow...
KredeGC · Dec 16, 2023 · 3766b97 · 3766b97
2 parents 5f665ac + 168a50a
commit 3766b97
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -34,13 +34,18 @@ jobs:
       with:
         version: "5.0.0-beta1"
     - name: Install GCC
-      if: matrix.machine.os == 'ubuntu-latest' && matrix.machine.toolset == 'gcc'
+      if: matrix.machine.toolset == 'gcc'
       run: sudo apt-get update && sudo apt-get install -y gcc g++
+    - name: Clang libstdc++ image workaround
+      if: matrix.machine.toolset == 'clang'
+      uses: mjp41/workaround8649@7929373c0fe5caf844d8115adccef39e3b5362e7
+      with:
+        os: ${{ matrix.machine.os }}
     - name: Install Clang & LLVM
-      if: matrix.machine.os == 'ubuntu-latest' && matrix.machine.toolset == 'clang'
+      if: matrix.machine.toolset == 'clang'
       run: sudo apt-get update && sudo apt-get install -y clang llvm lld
     - name: Install msbuild to PATH
-      if: matrix.machine.os == 'windows-latest' && matrix.machine.toolset == 'msc'
+      if: matrix.machine.toolset == 'msc'
       uses: microsoft/setup-msbuild@v1.1
     - name: Install 32-bit gcc libs
       if: matrix.architecture == 'x86' && matrix.machine.os == 'ubuntu-latest'