mirror of
https://github.com/SFML/SFML.git
synced 2024-11-24 20:31:05 +08:00
Revert to LLVM 18 until we can upgrade to macOS 14 images
This commit is contained in:
parent
c8dbd65ff5
commit
4e77e3ee95
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
@ -348,8 +348,8 @@ jobs:
|
|||||||
- { name: Linux, os: ubuntu-24.04 }
|
- { name: Linux, os: ubuntu-24.04 }
|
||||||
- { name: Linux DRM, os: ubuntu-24.04, flags: -DSFML_USE_DRM=ON }
|
- { name: Linux DRM, os: ubuntu-24.04, flags: -DSFML_USE_DRM=ON }
|
||||||
- { name: Linux OpenGL ES, os: ubuntu-24.04, flags: -DSFML_OPENGL_ES=ON }
|
- { name: Linux OpenGL ES, os: ubuntu-24.04, flags: -DSFML_OPENGL_ES=ON }
|
||||||
- { name: macOS, os: macos-12 }
|
- { name: macOS, os: macos-13 }
|
||||||
- { name: iOS, os: macos-12, flags: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64 }
|
- { name: iOS, os: macos-13, flags: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64 }
|
||||||
- { name: Android, os: ubuntu-24.04, flags: -DCMAKE_ANDROID_ARCH_ABI=x86_64 -DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=21 -DCMAKE_ANDROID_NDK=$ANDROID_NDK -DCMAKE_ANDROID_STL_TYPE=c++_shared }
|
- { name: Android, os: ubuntu-24.04, flags: -DCMAKE_ANDROID_ARCH_ABI=x86_64 -DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=21 -DCMAKE_ANDROID_NDK=$ANDROID_NDK -DCMAKE_ANDROID_STL_TYPE=c++_shared }
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@ -375,8 +375,8 @@ jobs:
|
|||||||
if: runner.os == 'macOS'
|
if: runner.os == 'macOS'
|
||||||
run: |
|
run: |
|
||||||
brew update
|
brew update
|
||||||
brew install llvm || true
|
brew install llvm@18 || true
|
||||||
echo /usr/local/opt/llvm/bin >> $GITHUB_PATH
|
echo "$(brew --prefix llvm@18)/bin" >> $GITHUB_PATH
|
||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: cmake --preset dev -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_UNITY_BUILD=ON ${{matrix.platform.flags}}
|
run: cmake --preset dev -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_UNITY_BUILD=ON ${{matrix.platform.flags}}
|
||||||
|
Loading…
Reference in New Issue
Block a user