Skip to content

Commit

Permalink
ci: Try re-enabling macosx-clang builds
Browse files Browse the repository at this point in the history
  • Loading branch information
BurningEnlightenment committed Feb 18, 2024
1 parent a20c419 commit e98a91c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/cpp-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,23 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-13, ubuntu-22.04, windows-2022]
os: [macos-14, ubuntu-22.04, windows-2022]
compiler: [gcc, clang, msvc]
exclude:
- os: macos-13
- os: macos-14
compiler: msvc
- os: macos-13
compiler: clang
- os: ubuntu-22.04
compiler: msvc
- os: windows-2022
compiler: gcc
include:
- os: macos-13
- os: macos-14
triplet: x64-macos
- os: macos-14
compiler: clang
triplet: x64-macos
install: |
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install llvm@16
- os: ubuntu-22.04
triplet: x64-linux
- os: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion tools/toolchains/x64-macos-clang-16-brew.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ execute_process(COMMAND brew --prefix llvm@16 OUTPUT_VARIABLE BREW_LLVM_PATH OUT

set(CMAKE_C_COMPILER "${BREW_LLVM_PATH}/bin/clang")
set(CMAKE_CXX_COMPILER "${BREW_LLVM_PATH}/bin/clang++")
set(CMAKE_OSX_SYSROOT /Applications/Xcode_15.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
set(CMAKE_OSX_DEPLOYMENT_TARGET 14.2)

set(CMAKE_C_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
Expand Down

0 comments on commit e98a91c

Please sign in to comment.