From e854a2e0dc2b3896f427fcb54361d11a85161648 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 4 Oct 2026 15:00:44 +0200 Subject: [PATCH] Switch macOS 14 CI jobs to macOS 15 macOS 14 runners will be retired by GitHub soon. --- .github/workflows/ci_cmake.yml | 8 ++++---- .github/workflows/ci_mac.yml | 6 +++--- .github/workflows/ci_mac_xcode.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci_cmake.yml b/.github/workflows/ci_cmake.yml index 8de8d9158a..68abf4933d 100644 --- a/.github/workflows/ci_cmake.yml +++ b/.github/workflows/ci_cmake.yml @@ -61,8 +61,8 @@ jobs: cmake_generator: Unix Makefiles cmake_samples: ALL cmake_build_toolkit: gtk3 - - name: macOS 14 wxOSX Xcode - runner: macos-14 + - name: macOS 15 wxOSX Xcode + runner: macos-15 cmake_generator: Xcode cmake_defines: -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" cmake_build_toolkit: osx_cocoa @@ -79,8 +79,8 @@ jobs: cmake_samples: SOME cmake_tests: OFF cmake_build_toolkit: gtk3 - - name: macOS 14 wxIOS - runner: macos-14 + - name: macOS 15 wxIOS + runner: macos-15 cmake_generator: Xcode cmake_defines: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_FIND_ROOT_PATH=/usr/local -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO cmake_samples: OFF diff --git a/.github/workflows/ci_mac.yml b/.github/workflows/ci_mac.yml index bede3d1047..19c73245da 100644 --- a/.github/workflows/ci_mac.yml +++ b/.github/workflows/ci_mac.yml @@ -88,15 +88,15 @@ jobs: configure_flags: --enable-std_string_conv_in_wxstring --disable-compat32 --disable-sys-libs use_asan: true - name: wxMac Intel C++17 - runner: macos-14 + runner: macos-15 arch: x86_64 configure_flags: --with-cxx=17 --with-macosx-version-min=10.12 - name: wxMac Universal C++14 - runner: macos-14 + runner: macos-15 arch: arm64 configure_flags: --with-cxx=14 --enable-universal_binary=arm64,x86_64 --disable-shared --disable-sys-libs --disable-debug --enable-optimise - name: wxiOS - runner: macos-14 + runner: macos-15 arch: x86_64 configure_flags: --with-osx_iphone --enable-monolithic --disable-sys-libs --host=i686-apple-darwin_sim --build=x86_64-apple-darwin17.7.0 configure_env: PKG_CONFIG_LIBDIR=/dev/null diff --git a/.github/workflows/ci_mac_xcode.yml b/.github/workflows/ci_mac_xcode.yml index f5b7661e01..383e93a6f5 100644 --- a/.github/workflows/ci_mac_xcode.yml +++ b/.github/workflows/ci_mac_xcode.yml @@ -90,7 +90,7 @@ jobs: configuration: 'Release' project: samples/minimal/minimal_cocoa.xcodeproj - name: iOS static Debug - runner: macos-14 + runner: macos-15 scheme: 'static' destination: 'generic/platform=iOS' arch: x86_64