From a918bcfe1d739c4e9df1546ca27dc3b4874eb033 Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Fri, 17 May 2024 10:54:31 -0500 Subject: [PATCH] chore: On CI, use Xcode 15.4 as latest instead of 15.3 (#1509) --- .github/workflows/codegen-build-test.yml | 2 +- .github/workflows/continuous-integration.yml | 18 +++++++++--------- .github/workflows/integration-test.yml | 18 +++++++++--------- .../workflows/release-configuration-build.yml | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/codegen-build-test.yml b/.github/workflows/codegen-build-test.yml index 3302dcf5d56..a21c25ecced 100644 --- a/.github/workflows/codegen-build-test.yml +++ b/.github/workflows/codegen-build-test.yml @@ -13,7 +13,7 @@ jobs: codegen-build-test: runs-on: macos-14-xlarge env: - DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer steps: - name: Checkout aws-sdk-swift uses: actions/checkout@v3 diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index e87d0ac45ae..35234aca3a9 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -21,31 +21,31 @@ jobs: - macos-14-xlarge xcode: - Xcode_14.1 - - Xcode_15.3 + - Xcode_15.4 destination: - 'platform=iOS Simulator,OS=16.1,name=iPhone 14' - - 'platform=iOS Simulator,OS=17.4,name=iPhone 15' + - 'platform=iOS Simulator,OS=17.5,name=iPhone 15' - 'platform=tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)' - - 'platform=tvOS Simulator,OS=17.4,name=Apple TV 4K (3rd generation) (at 1080p)' + - 'platform=tvOS Simulator,OS=17.5,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=OS X' exclude: # Don't run old macOS with new Xcode - runner: macos-13-xlarge - xcode: Xcode_15.3 + xcode: Xcode_15.4 # Don't run new macOS with old Xcode - runner: macos-14-xlarge xcode: Xcode_14.1 # Don't run old simulators with new Xcode - destination: 'platform=tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)' - xcode: Xcode_15.3 + xcode: Xcode_15.4 - destination: 'platform=iOS Simulator,OS=16.1,name=iPhone 14' - xcode: Xcode_15.3 + xcode: Xcode_15.4 # Don't run new simulators with old Xcode - - destination: 'platform=tvOS Simulator,OS=17.4,name=Apple TV 4K (3rd generation) (at 1080p)' + - destination: 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)' xcode: Xcode_14.1 - - destination: 'platform=iOS Simulator,OS=17.4,name=iPhone 15' + - destination: 'platform=iOS Simulator,OS=17.5,name=iPhone 15' xcode: Xcode_14.1 - destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro' xcode: Xcode_14.1 @@ -104,7 +104,7 @@ jobs: -scheme aws-sdk-swift \ -destination '${{ matrix.destination }}' \ test 2>&1 \ - | xcpretty + | xcbeautify linux: runs-on: ubuntu-latest diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 52c2a636676..71a7e3d02fd 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -24,31 +24,31 @@ jobs: - macos-14-xlarge xcode: - Xcode_14.1 - - Xcode_15.3 + - Xcode_15.4 destination: - 'platform=iOS Simulator,OS=16.1,name=iPhone 14' - - 'platform=iOS Simulator,OS=17.4,name=iPhone 15' + - 'platform=iOS Simulator,OS=17.5,name=iPhone 15' - 'platform=tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)' - - 'platform=tvOS Simulator,OS=17.4,name=Apple TV 4K (3rd generation) (at 1080p)' + - 'platform=tvOS Simulator,OS=17.5,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=OS X' exclude: # Don't run old macOS with new Xcode - runner: macos-13-xlarge - xcode: Xcode_15.3 + xcode: Xcode_15.4 # Don't run new macOS with old Xcode - runner: macos-14-xlarge xcode: Xcode_14.1 # Don't run old simulators with new Xcode - destination: 'platform=tvOS Simulator,OS=16.1,name=Apple TV 4K (3rd generation) (at 1080p)' - xcode: Xcode_15.3 + xcode: Xcode_15.4 - destination: 'platform=iOS Simulator,OS=16.1,name=iPhone 14' - xcode: Xcode_15.3 + xcode: Xcode_15.4 # Don't run new simulators with old Xcode - - destination: 'platform=tvOS Simulator,OS=17.4,name=Apple TV 4K (3rd generation) (at 1080p)' + - destination: 'platform=tvOS Simulator,OS=17.5,name=Apple TV 4K (3rd generation) (at 1080p)' xcode: Xcode_14.1 - - destination: 'platform=iOS Simulator,OS=17.4,name=iPhone 15' + - destination: 'platform=iOS Simulator,OS=17.5,name=iPhone 15' xcode: Xcode_14.1 - destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro' xcode: Xcode_14.1 @@ -123,7 +123,7 @@ jobs: -testPlan AWSIntegrationTestsOnCI \ -destination '${{ matrix.destination }}' \ test 2>&1 \ - | xcpretty + | xcbeautify linux: runs-on: ubuntu-latest diff --git a/.github/workflows/release-configuration-build.yml b/.github/workflows/release-configuration-build.yml index c1668b62e09..0d1cff141c4 100644 --- a/.github/workflows/release-configuration-build.yml +++ b/.github/workflows/release-configuration-build.yml @@ -17,7 +17,7 @@ jobs: codegen-build-with-release-configuration: runs-on: macos-14-xlarge env: - DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer steps: - name: Checkout aws-sdk-swift uses: actions/checkout@v3