Skip to content

Commit 8982d73

Browse files
eXpl0it3reXpl0it3r
committed
Migrate away from macos-13 images
macOS 13 has been marked as Tier 3 configuration in Homebrew, which leads to a lot of tooling being built from source, including LLVM, taking hours to complete.
1 parent df49e32 commit 8982d73

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
- { name: Linux Clang, os: ubuntu-24.04, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -GNinja , gcovr_options: '--gcov-executable="llvm-cov-$CLANG_VERSION gcov"' }
4141
- { name: Linux GCC DRM, os: ubuntu-24.04, flags: -DSFML_USE_DRM=ON -DSFML_RUN_DISPLAY_TESTS=OFF -GNinja }
4242
- { name: Linux GCC OpenGL ES, os: ubuntu-24.04, flags: -DSFML_OPENGL_ES=ON -DSFML_RUN_DISPLAY_TESTS=OFF -GNinja }
43-
- { name: macOS x64, os: macos-13, flags: -GNinja }
44-
- { name: macOS x64 Xcode, os: macos-13, flags: -GXcode }
43+
- { name: macOS x64, os: macos-15, flags: -GNinja -DCMAKE_OSX_ARCHITECTURES=x86_64 }
44+
- { name: macOS x64 Xcode, os: macos-15, flags: -GXcode -DCMAKE_OSX_ARCHITECTURES=x86_64 }
4545
- { name: macOS arm64, os: macos-15, flags: -GNinja -DSFML_RUN_AUDIO_DEVICE_TESTS=OFF }
4646
- { name: iOS Xcode, os: macos-15, flags: -DCMAKE_SYSTEM_NAME=iOS -GXcode -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO }
4747
config:

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- { name: Windows MinGW x86, os: windows-2025, flags: -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ }
2525
- { name: Windows MinGW x64, os: windows-2025, flags: -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ }
2626
- { name: Linux GCC, os: ubuntu-24.04 }
27-
- { name: macOS x64, os: macos-13 }
27+
- { name: macOS x64, os: macos-15, flags: -DCMAKE_OSX_ARCHITECTURES=x86_64 }
2828
- { name: macOS arm64, os: macos-15 }
2929
config:
3030
- { name: Shared, flags: -DBUILD_SHARED_LIBS=ON }
@@ -33,8 +33,8 @@ jobs:
3333
- { name: Release, flags: -DCMAKE_BUILD_TYPE=Release }
3434
- { name: Debug, flags: -DCMAKE_BUILD_TYPE=Debug }
3535
include:
36-
- platform: { name: macOS x64, os: macos-13 }
37-
config: { name: Frameworks, flags: -DSFML_BUILD_FRAMEWORKS=ON -DBUILD_SHARED_LIBS=ON }
36+
- platform: { name: macOS x64, os: macos-15 }
37+
config: { name: Frameworks, flags: -DSFML_BUILD_FRAMEWORKS=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_OSX_ARCHITECTURES=x86_64 }
3838
type: { name: Release }
3939
- platform: { name: macOS arm64, os: macos-15 }
4040
config: { name: Frameworks, flags: -DSFML_BUILD_FRAMEWORKS=ON -DBUILD_SHARED_LIBS=ON }
@@ -279,7 +279,7 @@ jobs:
279279
- { name: Windows MinGW x86, os: windows-2025 }
280280
- { name: Windows MinGW x64, os: windows-2025 }
281281
- { name: Linux GCC, os: ubuntu-24.04 }
282-
- { name: macOS x64, os: macos-13 }
282+
- { name: macOS x64, os: macos-15 }
283283
- { name: macOS arm64, os: macos-15 }
284284

285285
steps:

0 commit comments

Comments
 (0)