Skip to content

Commit 5777bb4

Browse files
Add compilers to the matrix
Signed-off-by: Julien Jerphanion <[email protected]> Co-authored-by: Johan Mabille <[email protected]>
1 parent 01d2c32 commit 5777bb4

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

.github/workflows/osx.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,17 @@ jobs:
2222
config:
2323
- { name: Debug }
2424
- { name: Release }
25+
compiler:
26+
- clang
27+
- apple-clang
2528

2629
steps:
2730

2831
- name: Checkout code
2932
uses: actions/checkout@v3
3033

31-
- name: Add specification clang++ in the conda environment specification
34+
- name: Add specification of clang++ in the conda environment specification
35+
if: matrix.compiler == 'clang'
3236
run: |
3337
echo " - clangxx==17.0.6" >> environment-dev.yml
3438
@@ -40,11 +44,18 @@ jobs:
4044
init-shell: bash
4145
cache-downloads: true
4246

43-
- name: Set environment variable to use clang++
47+
- name: Use clang++ from conda-forge
48+
if: matrix.compiler == 'clang'
4449
run: |
4550
echo "CXX=$CONDA_PREFIX/bin/clang++" >> $GITHUB_ENV
4651
echo "CMAKE_CXX_COMPILER=$CONDA_PREFIX/bin/clang++" >> $GITHUB_ENV
4752
53+
- name: Use Apple Clang (i.e. clang++ from Xcode)
54+
if: matrix.compiler == 'apple-clang'
55+
run: |
56+
echo "CXX=/usr/bin/clang++" >> $GITHUB_ENV
57+
echo "CMAKE_CXX_COMPILER=/usr/bin/clang++" >> $GITHUB_ENV
58+
4859
- name: Configure using CMake
4960
run: cmake -Bbuild -DCMAKE_BUILD_TYPE:STRING=${{matrix.config.name}} -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DBUILD_TESTS=ON
5061

0 commit comments

Comments
 (0)