From a6eaf86d23c1db761850aeb2d71fe9fca0f333e5 Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Thu, 10 Oct 2024 17:03:37 -0500 Subject: [PATCH] chore: Use macOS 15 with Xcode 16 on CI (#1786) --- .github/workflows/continuous-integration.yml | 10 +++++----- .github/workflows/integration-test.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index efb96d01253..ab5ca4f7c1d 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -16,24 +16,24 @@ jobs: # This matrix runs tests on iOS sim & Mac, on oldest & newest supported Xcodes runner: - macos-13 - - macos-14 + - macos-15 xcode: - Xcode_15.2 - Xcode_16 destination: - 'platform=iOS Simulator,OS=17.2,name=iPhone 15' - - 'platform=iOS Simulator,OS=18.0,name=iPhone 15' + - 'platform=iOS Simulator,OS=18.0,name=iPhone 16' - 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' - 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)' - 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro' - 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro' - - 'platform=OS X' + - 'platform=macOS' exclude: # Don't run old macOS with new Xcode - runner: macos-13 xcode: Xcode_16 # Don't run new macOS with old Xcode - - runner: macos-14 + - runner: macos-15 xcode: Xcode_15.2 # Don't run old simulators with new Xcode - destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' @@ -45,7 +45,7 @@ jobs: # Don't run new simulators with old Xcode - destination: 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)' xcode: Xcode_15.2 - - destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 15' + - destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 16' xcode: Xcode_15.2 - destination: 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro' xcode: Xcode_15.2 diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 61747f9c893..81923ce41d2 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -19,24 +19,24 @@ jobs: # This matrix runs tests on iOS sim & Mac, on oldest & newest supported Xcodes runner: - macos-13 - - macos-14 + - macos-15 xcode: - Xcode_15.2 - Xcode_16 destination: - 'platform=iOS Simulator,OS=17.2,name=iPhone 15' - - 'platform=iOS Simulator,OS=18.0,name=iPhone 15' + - 'platform=iOS Simulator,OS=18.0,name=iPhone 16' - 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' - 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)' - 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro' - 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro' - - 'platform=OS X' + - 'platform=macOS' exclude: # Don't run old macOS with new Xcode - runner: macos-13 xcode: Xcode_16 # Don't run new macOS with old Xcode - - runner: macos-14 + - runner: macos-15 xcode: Xcode_15.2 # Don't run old simulators with new Xcode - destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' @@ -48,7 +48,7 @@ jobs: # Don't run new simulators with old Xcode - destination: 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)' xcode: Xcode_15.2 - - destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 15' + - destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 16' xcode: Xcode_15.2 - destination: 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro' xcode: Xcode_15.2