From 376d656d3cec4240c1ed643c4885489e1d7b3570 Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Tue, 2 Jul 2024 14:21:08 -0500 Subject: [PATCH 1/3] Run Xcode 16 (Swift 6) Beta in CI --- .github/workflows/continuous-integration.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a25df7547b3..2a08e2f21e7 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -22,6 +22,7 @@ jobs: xcode: - Xcode_15.2 - Xcode_15.4 + - Xcode_16.0 destination: - 'platform=iOS Simulator,OS=17.2,name=iPhone 15' - 'platform=iOS Simulator,OS=17.5,name=iPhone 15' @@ -34,6 +35,8 @@ jobs: # Don't run old macOS with new Xcode - runner: macos-13 xcode: Xcode_15.4 + - runner: macos-13 + xcode: Xcode_16.0 # Don't run new macOS with old Xcode - runner: macos-14 xcode: Xcode_15.2 @@ -51,6 +54,19 @@ jobs: xcode: Xcode_15.2 - destination: 'platform=visionOS Simulator,OS=1.2,name=Apple Vision Pro' xcode: Xcode_15.2 + # Don't run any sims with Xcode 16, only macOS + - destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' + xcode: Xcode_16.0 + - destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15' + xcode: Xcode_16.0 + - destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro' + xcode: Xcode_16.0 + - destination: 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)' + xcode: Xcode_16.0 + - destination: 'platform=iOS Simulator,OS=17.5,name=iPhone 15' + xcode: Xcode_16.0 + - destination: 'platform=visionOS Simulator,OS=1.2,name=Apple Vision Pro' + xcode: Xcode_16.0 steps: - name: Checkout aws-sdk-swift uses: actions/checkout@v4 From 7f0ac8fb3f766bcd4b6ff71031632c81ecb92134 Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Fri, 6 Sep 2024 18:08:47 -0500 Subject: [PATCH 2/3] Run Xcode 16.0 as max instead of 15.4 --- .github/workflows/continuous-integration.yml | 34 ++++++-------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index ac3f400309f..51a9d4c9066 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -21,20 +21,17 @@ jobs: - macos-14 xcode: - Xcode_15.2 - - Xcode_15.4 - Xcode_16.0 destination: - 'platform=iOS Simulator,OS=17.2,name=iPhone 15' - - 'platform=iOS Simulator,OS=17.5,name=iPhone 15' + - 'platform=iOS Simulator,OS=18.0,name=iPhone 15' - 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' - - 'platform=tvOS Simulator,OS=17.5,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=1.2,name=Apple Vision Pro' + - 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro' - 'platform=OS X' exclude: # Don't run old macOS with new Xcode - - runner: macos-13 - xcode: Xcode_15.4 - runner: macos-13 xcode: Xcode_16.0 # Don't run new macOS with old Xcode @@ -42,31 +39,18 @@ jobs: 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)' - xcode: Xcode_15.4 + xcode: Xcode_16.0 - destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15' - xcode: Xcode_15.4 + xcode: Xcode_16.0 - destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro' - xcode: Xcode_15.4 + xcode: Xcode_16.0 # Don't run new simulators with old Xcode - - destination: 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)' + - destination: 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)' xcode: Xcode_15.2 - - destination: 'platform=iOS Simulator,OS=17.5,name=iPhone 15' + - destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 15' xcode: Xcode_15.2 - - destination: 'platform=visionOS Simulator,OS=1.2,name=Apple Vision Pro' + - destination: 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro' xcode: Xcode_15.2 - # Don't run any sims with Xcode 16, only macOS - - destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' - xcode: Xcode_16.0 - - destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15' - xcode: Xcode_16.0 - - destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro' - xcode: Xcode_16.0 - - destination: 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)' - xcode: Xcode_16.0 - - destination: 'platform=iOS Simulator,OS=17.5,name=iPhone 15' - xcode: Xcode_16.0 - - destination: 'platform=visionOS Simulator,OS=1.2,name=Apple Vision Pro' - xcode: Xcode_16.0 steps: - name: Checkout aws-sdk-swift uses: actions/checkout@v4 From 771044d224bbf93b555faf4d10375142f7ee34af Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Fri, 6 Sep 2024 19:27:35 -0500 Subject: [PATCH 3/3] Run integration tests on Xcode 16 --- .github/workflows/integration-test.yml | 22 +++++++++---------- .../workflows/release-configuration-build.yml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 47f46bc888e..233e7c8c646 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -24,35 +24,35 @@ jobs: - macos-14 xcode: - Xcode_15.2 - - Xcode_15.4 + - Xcode_16.0 destination: - 'platform=iOS Simulator,OS=17.2,name=iPhone 15' - - 'platform=iOS Simulator,OS=17.5,name=iPhone 15' + - 'platform=iOS Simulator,OS=18.0,name=iPhone 15' - 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)' - - 'platform=tvOS Simulator,OS=17.5,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=1.2,name=Apple Vision Pro' + - 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro' - 'platform=OS X' exclude: # Don't run old macOS with new Xcode - runner: macos-13 - xcode: Xcode_15.4 + xcode: Xcode_16.0 # Don't run new macOS with old Xcode - runner: macos-14 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)' - xcode: Xcode_15.4 + xcode: Xcode_16.0 - destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15' - xcode: Xcode_15.4 + xcode: Xcode_16.0 - destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro' - xcode: Xcode_15.4 + xcode: Xcode_16.0 # Don't run new simulators with old Xcode - - destination: 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)' + - destination: 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)' xcode: Xcode_15.2 - - destination: 'platform=iOS Simulator,OS=17.5,name=iPhone 15' + - destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 15' xcode: Xcode_15.2 - - destination: 'platform=visionOS Simulator,OS=1.2,name=Apple Vision Pro' + - destination: 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro' xcode: Xcode_15.2 steps: - name: Configure AWS Credentials for Integration Tests diff --git a/.github/workflows/release-configuration-build.yml b/.github/workflows/release-configuration-build.yml index 0d1cff141c4..105042b12f7 100644 --- a/.github/workflows/release-configuration-build.yml +++ b/.github/workflows/release-configuration-build.yml @@ -15,7 +15,7 @@ env: jobs: codegen-build-with-release-configuration: - runs-on: macos-14-xlarge + runs-on: macos-14 env: DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer steps: