Skip to content

Commit 75935e9

Browse files
committed
Use environment to get compiler on CI
1 parent f9c6d1a commit 75935e9

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/macos.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
fail-fast: false
1717

1818
matrix:
19-
preset: [debug, release]
19+
preset: [debug, release, gcov, asan, lsan, usan]
2020
# TODO: compiler: [g++, clang++-19]
21-
compiler: [g++, clang++-18]
21+
compiler: [clang++-19]
2222

2323
steps:
2424
- uses: actions/checkout@v4
@@ -37,9 +37,9 @@ jobs:
3737
run: |
3838
brew install llvm@19 || echo ignored
3939
40-
- name: macos clang++-18 ${{ matrix.preset }}
40+
- name: macos clang++-19 ${{ matrix.preset }}
4141
if: startsWith(matrix.compiler, 'clang')
42-
run: CXX=$(brew --prefix llvm@18)/bin/clang++ cmake --workflow --preset ${{ matrix.preset }}
42+
run: CXX=$(brew --prefix llvm@19)/bin/clang++ cmake --workflow --preset ${{ matrix.preset }}
4343

4444
- name: macos g++ ${{ matrix.preset }}
4545
if: startsWith(matrix.compiler, 'g++')

CMakePresets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
{
5454
"name": "release",
5555
"configurePreset": "release",
56-
"configuration": "Release",
56+
"configuration": "RelWithDebInfo",
5757
"targets": [
5858
"all_verify_interface_header_sets",
5959
"install"
@@ -99,7 +99,7 @@
9999
{
100100
"name": "release",
101101
"inherits": "test_base",
102-
"configuration": "Release",
102+
"configuration": "RelWithDebInfo",
103103
"configurePreset": "release"
104104
}
105105
],
@@ -108,7 +108,7 @@
108108
"name": "release",
109109
"configurePreset": "release",
110110
"configurations": [
111-
"Release"
111+
"RelWithDebInfo"
112112
],
113113
"generators": [
114114
"TGZ"

cmake/CMakeDarwinPresets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"root-config"
1717
],
1818
"cacheVariables": {
19-
"CMAKE_C_COMPILER": "clang",
20-
"CMAKE_CXX_COMPILER": "clang++",
19+
"CMAKE_C_COMPILER": "$env{CC}",
20+
"CMAKE_CXX_COMPILER": "$env{CXX}",
2121
"CMAKE_CONFIGURATION_TYPES": "Debug;RelWithDebInfo;Coverage;Asan;Lsan;Usan",
2222
"CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic",
2323
"CMAKE_C_FLAGS": "-Wall -Wextra -Wpedantic",

cmake/CMakeLinuxPresets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"root-config"
1717
],
1818
"cacheVariables": {
19-
"CMAKE_C_COMPILER": "clang",
20-
"CMAKE_CXX_COMPILER": "clang++",
19+
"CMAKE_C_COMPILER": "$env{CC}",
20+
"CMAKE_CXX_COMPILER": "$env{CXX}",
2121
"CMAKE_CONFIGURATION_TYPES": "Debug;RelWithDebInfo;Coverage;Asan;Lsan;Usan",
2222
"CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic",
2323
"CMAKE_C_FLAGS": "-Wall -Wextra -Wpedantic",

0 commit comments

Comments
 (0)