From 4e77e3ee953557be24da3fe36607a8e4eb958526 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Tue, 1 Oct 2024 08:28:31 -0600 Subject: [PATCH] Revert to LLVM 18 until we can upgrade to macOS 14 images --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 013c69f1f..219c01fe0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -348,8 +348,8 @@ jobs: - { name: Linux, os: ubuntu-24.04 } - { 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: macOS, os: macos-12 } - - { name: iOS, os: macos-12, flags: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64 } + - { name: macOS, os: macos-13 } + - { 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 } steps: @@ -375,8 +375,8 @@ jobs: if: runner.os == 'macOS' run: | brew update - brew install llvm || true - echo /usr/local/opt/llvm/bin >> $GITHUB_PATH + brew install llvm@18 || true + echo "$(brew --prefix llvm@18)/bin" >> $GITHUB_PATH - name: Configure run: cmake --preset dev -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_UNITY_BUILD=ON ${{matrix.platform.flags}}