From 11167170cd4b17e533c49577ed29090d3bdeb2ac Mon Sep 17 00:00:00 2001 From: ClausKlein Date: Fri, 8 Nov 2024 22:41:55 +0100 Subject: [PATCH] Fix typo and logic on CI --- .github/workflows/ci_tests.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 3f3baf09..133f7455 100644 --- 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: