Skip to content

Commit ffd4c78

Browse files
committed
update macos ci
1 parent 2be3819 commit ffd4c78

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

.github/workflows/MacOs.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,15 @@ jobs:
4949
brew install ${{matrix.compiler.tool}}@${{matrix.compiler.ver}} ninja
5050
cmake -E make_directory ${{runner.workspace}}/build
5151
52-
- name: Setup Environment
52+
- name: Try Setup LLVM Environment
5353
if: matrix.compiler.tool == 'llvm'
5454
run: |
55-
echo "CXX=/opt/homebrew/opt/llvm@${{matrix.compiler.ver}}/bin/${{matrix.cxx}}" >> $GITHUB_ENV
56-
echo "CC=/opt/homebrew/opt/llvm@${{matrix.compiler.ver}}/bin/${{matrix.cc}}" >> $GITHUB_ENV
57-
58-
- name: Setup Environment
59-
if: matrix.compiler.tool == 'gcc'
60-
run: |
61-
echo "CXX=${{matrix.cxx}}" >> $GITHUB_ENV
62-
echo "CC=${{matrix.cc}}" >> $GITHUB_ENV
55+
"PATH=$(brew --prefix llvm@${{matrix.compiler.ver}})/bin:${PATH}" >> $GITHUB_ENV
6356
6457
- name: Configure
58+
env:
59+
CXX: ${{matrix.cxx}}
60+
CC: ${{matrix.cc}}
6561
run: cmake -B ${{runner.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_ALL_TESTS=ON
6662

6763
- name: Build

0 commit comments

Comments
 (0)