Skip to content

Commit a9298df

Browse files
committed
Upgrade all macOS 12 CI jobs to macOS 13
1 parent c67e835 commit a9298df

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ jobs:
4242
- { name: Linux Clang, os: ubuntu-22.04, flags: -DCMAKE_CXX_COMPILER=clang++ -GNinja , gcovr_options: '--gcov-executable="llvm-cov-$CLANG_VERSION gcov"' }
4343
- { name: Linux GCC DRM, os: ubuntu-22.04, flags: -DSFML_USE_DRM=ON -DSFML_RUN_DISPLAY_TESTS=OFF -GNinja }
4444
- { name: Linux GCC OpenGL ES, os: ubuntu-22.04, flags: -DSFML_OPENGL_ES=ON -DSFML_RUN_DISPLAY_TESTS=OFF -GNinja }
45-
- { name: macOS x64, os: macos-12, flags: -GNinja }
46-
- { name: macOS x64 Xcode, os: macos-12, flags: -GXcode }
45+
- { name: macOS x64, os: macos-13, flags: -GNinja }
46+
- { name: macOS x64 Xcode, os: macos-13, flags: -GXcode }
4747
- { name: macOS arm64, os: macos-14, flags: -GNinja -DSFML_RUN_AUDIO_DEVICE_TESTS=OFF }
48-
- { name: iOS, os: macos-12, flags: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64 }
49-
- { name: iOS Xcode, os: macos-12, flags: -DCMAKE_SYSTEM_NAME=iOS -GXcode -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO }
48+
- { name: iOS, os: macos-13, flags: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64 }
49+
- { name: iOS Xcode, os: macos-13, flags: -DCMAKE_SYSTEM_NAME=iOS -GXcode -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO }
5050
config:
5151
- { name: Shared, flags: -DBUILD_SHARED_LIBS=ON }
5252
- { name: Static, flags: -DBUILD_SHARED_LIBS=OFF }
@@ -65,9 +65,9 @@ jobs:
6565
config: { name: Static Standard Libraries, flags: -GNinja -DSFML_USE_MESA3D=ON -DCMAKE_CXX_COMPILER=g++ -DSFML_USE_STATIC_STD_LIBS=ON }
6666
- platform: { name: Windows MinGW, os: windows-2022 }
6767
config: { name: Static with PCH (GCC), flags: -GNinja -DSFML_USE_MESA3D=ON -DCMAKE_CXX_COMPILER=g++ -DBUILD_SHARED_LIBS=OFF -DSFML_ENABLE_PCH=ON -DSFML_ENABLE_STDLIB_ASSERTIONS=OFF } # disabling stdlib assertions due to false positive
68-
- platform: { name: macOS, os: macos-12 }
68+
- platform: { name: macOS, os: macos-13 }
6969
config: { name: Frameworks, flags: -GNinja -DSFML_BUILD_FRAMEWORKS=ON -DBUILD_SHARED_LIBS=ON }
70-
- platform: { name: macOS , os: macos-12 }
70+
- platform: { name: macOS , os: macos-13 }
7171
config: { name: System Deps, flags: -GNinja -DBUILD_SHARED_LIBS=ON -DSFML_USE_SYSTEM_DEPS=ON }
7272
- platform: { name: Android, os: ubuntu-22.04 }
7373
config:
@@ -144,6 +144,10 @@ jobs:
144144
brew update
145145
brew install gcovr ccache || true
146146
147+
- name: Install macOS System Deps
148+
if: contains(matrix.config.name, 'System Deps')
149+
run: brew install flac libvorbis || true
150+
147151
# In addition to installing a known working version of CCache, this action also takes care of saving and restoring the cache for us
148152
# Additionally it outputs information at the end of each job that helps us to verify if the cache is working properly
149153
- name: Setup CCache

0 commit comments

Comments
 (0)