diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00f64ac..07856ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -128,9 +128,10 @@ jobs: config: - { name: 'Macos Clang', - cc: $(brew --prefix llvm@21)/bin/clang, - cxx: $(brew --prefix llvm@21)/bin/clang++, - profiles: '-pr:h conan/clang21 -pr:h conan/libc++' + cc: $(brew --prefix llvm@22)/bin/clang, + cxx: $(brew --prefix llvm@22)/bin/clang++, + gcov: $(brew --prefix llvm@22)/bin/llvm-cov gcov, + profiles: '-pr:h conan/clang22 -pr:h conan/libc++' } steps: - name: Checkout repository @@ -143,9 +144,9 @@ jobs: - name: Force clang to use homebrew libc++ run: | mkdir ~/.config/clang - echo "-I/opt/homebrew/opt/llvm/include" > ~/.config/clang/clang++.cfg - echo "-L/opt/homebrew/opt/llvm/lib/c++" >> ~/.config/clang/clang++.cfg - echo "-L/opt/homebrew/opt/llvm/lib/unwind" >> ~/.config/clang/clang++.cfg + echo "-I$HOMEBREW_PREFIX/opt/llvm/include" > ~/.config/clang/clang++.cfg + echo "-L$HOMEBREW_PREFIX/opt/llvm/lib/c++" >> ~/.config/clang/clang++.cfg + echo "-L$HOMEBREW_PREFIX/opt/llvm/lib/unwind" >> ~/.config/clang/clang++.cfg echo "-lunwind" >> ~/.config/clang/clang++.cfg - name: Setup uv @@ -155,7 +156,7 @@ jobs: - name: Install dependencies run: | - brew install llvm@21 + brew install llvm@22 uv sync uv run conan profile detect @@ -195,7 +196,7 @@ jobs: - name: Collect test coverage if: matrix.build.type == 'Debug' - run: GCOV="$(brew --prefix llvm@21)/bin/llvm-cov gcov" uv run gcovr + run: GCOV="${{ matrix.config.gcov }}" uv run gcovr build_windows: name: ${{ matrix.config.name }} ${{ matrix.build.type }} diff --git a/conan/clang21 b/conan/clang21 deleted file mode 100644 index d996b25..0000000 --- a/conan/clang21 +++ /dev/null @@ -1,5 +0,0 @@ -include(cppstd) - -[settings] -compiler=clang -compiler.version=21