From a9298df466b5fd74f99e313accf81cbfa023b8a1 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Tue, 1 Oct 2024 17:10:43 -0600 Subject: [PATCH] Upgrade all macOS 12 CI jobs to macOS 13 --- .github/workflows/ci.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef46ee1ca..54491bee7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,11 +42,11 @@ jobs: - { name: Linux Clang, os: ubuntu-22.04, flags: -DCMAKE_CXX_COMPILER=clang++ -GNinja , gcovr_options: '--gcov-executable="llvm-cov-$CLANG_VERSION gcov"' } - { name: Linux GCC DRM, os: ubuntu-22.04, flags: -DSFML_USE_DRM=ON -DSFML_RUN_DISPLAY_TESTS=OFF -GNinja } - { name: Linux GCC OpenGL ES, os: ubuntu-22.04, flags: -DSFML_OPENGL_ES=ON -DSFML_RUN_DISPLAY_TESTS=OFF -GNinja } - - { name: macOS x64, os: macos-12, flags: -GNinja } - - { name: macOS x64 Xcode, os: macos-12, flags: -GXcode } + - { name: macOS x64, os: macos-13, flags: -GNinja } + - { name: macOS x64 Xcode, os: macos-13, flags: -GXcode } - { name: macOS arm64, os: macos-14, flags: -GNinja -DSFML_RUN_AUDIO_DEVICE_TESTS=OFF } - - { name: iOS, os: macos-12, flags: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64 } - - { name: iOS Xcode, os: macos-12, flags: -DCMAKE_SYSTEM_NAME=iOS -GXcode -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO } + - { name: iOS, os: macos-13, flags: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64 } + - { name: iOS Xcode, os: macos-13, flags: -DCMAKE_SYSTEM_NAME=iOS -GXcode -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO } config: - { name: Shared, flags: -DBUILD_SHARED_LIBS=ON } - { name: Static, flags: -DBUILD_SHARED_LIBS=OFF } @@ -65,9 +65,9 @@ jobs: config: { name: Static Standard Libraries, flags: -GNinja -DSFML_USE_MESA3D=ON -DCMAKE_CXX_COMPILER=g++ -DSFML_USE_STATIC_STD_LIBS=ON } - platform: { name: Windows MinGW, os: windows-2022 } 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 - - platform: { name: macOS, os: macos-12 } + - platform: { name: macOS, os: macos-13 } config: { name: Frameworks, flags: -GNinja -DSFML_BUILD_FRAMEWORKS=ON -DBUILD_SHARED_LIBS=ON } - - platform: { name: macOS , os: macos-12 } + - platform: { name: macOS , os: macos-13 } config: { name: System Deps, flags: -GNinja -DBUILD_SHARED_LIBS=ON -DSFML_USE_SYSTEM_DEPS=ON } - platform: { name: Android, os: ubuntu-22.04 } config: @@ -144,6 +144,10 @@ jobs: brew update brew install gcovr ccache || true + - name: Install macOS System Deps + if: contains(matrix.config.name, 'System Deps') + run: brew install flac libvorbis || true + # In addition to installing a known working version of CCache, this action also takes care of saving and restoring the cache for us # Additionally it outputs information at the end of each job that helps us to verify if the cache is working properly - name: Setup CCache