Skip to content

Commit 3766b97

Browse files
authored
Merge pull request #16 from KredeGC/workflow-fix
Fix clang workflow...
2 parents 5f665ac + 168a50a commit 3766b97

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,18 @@ jobs:
3434
with:
3535
version: "5.0.0-beta1"
3636
- name: Install GCC
37-
if: matrix.machine.os == 'ubuntu-latest' && matrix.machine.toolset == 'gcc'
37+
if: matrix.machine.toolset == 'gcc'
3838
run: sudo apt-get update && sudo apt-get install -y gcc g++
39+
- name: Clang libstdc++ image workaround
40+
if: matrix.machine.toolset == 'clang'
41+
uses: mjp41/workaround8649@7929373c0fe5caf844d8115adccef39e3b5362e7
42+
with:
43+
os: ${{ matrix.machine.os }}
3944
- name: Install Clang & LLVM
40-
if: matrix.machine.os == 'ubuntu-latest' && matrix.machine.toolset == 'clang'
45+
if: matrix.machine.toolset == 'clang'
4146
run: sudo apt-get update && sudo apt-get install -y clang llvm lld
4247
- name: Install msbuild to PATH
43-
if: matrix.machine.os == 'windows-latest' && matrix.machine.toolset == 'msc'
48+
if: matrix.machine.toolset == 'msc'
4449
uses: microsoft/[email protected]
4550
- name: Install 32-bit gcc libs
4651
if: matrix.architecture == 'x86' && matrix.machine.os == 'ubuntu-latest'

0 commit comments

Comments
 (0)