Skip to content

Commit 11ca9b5

Browse files
committed
This might work, so let's load it into the cache.
Signed-off-by: Johannes Kalmbach <[email protected]>
1 parent db49da8 commit 11ca9b5

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

.github/workflows/macos.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ jobs:
4343
run: |
4444
brew install conan@2
4545
- name: Install dependencies
46-
if: true
4746
run: |
48-
49-
which cc
50-
cc --version
5147
brew install llvm@16
5248
brew install conan@2
5349
echo 'export PATH="/usr/local/opt/llvm@16/bin:$PATH"' >> ~/.bash_profile
@@ -64,20 +60,12 @@ jobs:
6460
echo CXX="/usr/local/opt/llvm@16/bin/clang++" >> $GITHUB_ENV
6561
source ~/.bash_profile
6662
- name: Print clang version
67-
run: |
68-
clang++ --version
69-
echo 'int main() {}' >> test.cpp
70-
clang++ test.cpp -stdlib=libc++ -v
71-
clang test.cpp -stdlib=libc++ -v
72-
$CC test.cpp -stdlib=libc++ -v
73-
$CXX test.cpp -stdlib=libc++ -v
74-
c++ test.cpp
63+
run: clang++ --version
7564

7665
- name: Cache for conan
77-
if: false
7866
uses: actions/cache@v3
7967
env:
80-
cache-name: cache-conan-modules
68+
cache-name: cache-conan-modules-macos-13
8169
with:
8270
path: ~/.conan2
8371
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('conanfile.txt') }}
@@ -86,11 +74,7 @@ jobs:
8674
- name: Install and run conan
8775
working-directory: ${{github.workspace}}/build
8876
run: |
89-
which cc
90-
cc --version
91-
#conan profile detect
9277
conan install .. -pr:b=../conanprofiles/clang-16-macos -pr:h=../conanprofiles/clang-16-macos -of=. --build=missing
93-
#conan install .. -of=. --build=missing --verbose
9478
- name: Configure CMake
9579
# For std::ranges::join_view we need the -fexperimental-library flag on libc++16, which on Mac requires to manually tinker with the linking flags.
9680
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build-type}} -DCMAKE_TOOLCHAIN_FILE="$(pwd)/build/conan_toolchain.cmake" -DUSE_PARALLEL=true -DRUN_EXPENSIVE_TESTS=false -DENABLE_EXPENSIVE_CHECKS=true -DCMAKE_CXX_COMPILER=clang++ -DADDITIONAL_COMPILER_FLAGS="-fexperimental-library" -D_NO_TIMING_TESTS=ON -DADDITIONAL_LINKER_FLAGS="-L$(brew --prefix llvm)/lib/c++"

0 commit comments

Comments
 (0)