Fix typo and logic on CI

bemanproject · Nov 8, 2024 · 1116717 · 1116717
1 parent 51c8dd7
commit 1116717
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -80,16 +80,14 @@ jobs:
           ninja --version
 
       - name: Configure CMake on macos with clang
-        if: startsWith(matrix.compiler, 'clang') && startsWith(matrix.platform, 'macos')
+        if: startsWith(matrix.compiler.c, 'clang') && startsWith(matrix.platform, 'macos')
         run: |
-          cmake -B build -S . "-DCMAKE_CXX_STANDARD=${{ matrix.cpp_version }} ${{ matrix.cmake_args.args }}"
+          CC=$(brew --prefix llvm@18)/bin/clang CXX=$(brew --prefix llvm@18)/bin/clang++ cmake -B build -S . "-DCMAKE_CXX_STANDARD=${{ matrix.cpp_version }} ${{ matrix.cmake_args.args }}"
         env:
-          CC: $(brew --prefix llvm@18)/bin/clang
-          CXX: $(brew --prefix llvm@18)/bin/clang++
           CMAKE_GENERATOR: "Ninja Multi-Config"
 
       - name: Configure CMake
-        if: startsWith(matrix.compiler, 'gcc') || startsWith(matrix.platform, 'ubuntu')
+        if: ( startsWith(matrix.compiler.c, 'gcc') || startsWith(matrix.platform, 'ubuntu') ) || ( startsWith(matrix.compiler.c, 'gcc') && startsWith(matrix.platform, 'macos') )
         run: |
           cmake -B build -S . "-DCMAKE_CXX_STANDARD=${{ matrix.cpp_version }} ${{ matrix.cmake_args.args }}"
         env: