Move codegen-build-test & integration to Xcode 16.1

awslabs · Oct 28, 2024 · 235e227 · 235e227
1 parent a64108b
commit 235e227
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/codegen-build-test.yml b/.github/workflows/codegen-build-test.yml
@@ -11,9 +11,9 @@ env:
 
 jobs:
   codegen-build-test:
-    runs-on: macos-14-xlarge
+    runs-on: macos-15-xlarge
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer
     steps:
       - name: Checkout aws-sdk-swift
         uses: actions/checkout@v3

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -18,45 +18,45 @@ jobs:
       matrix:
         # 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
+          - Xcode_16.1
         destination:
           - 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
-          - 'platform=iOS Simulator,OS=18.0,name=iPhone 16'
+          - 'platform=iOS Simulator,OS=18.1,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=tvOS Simulator,OS=18.1,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=visionOS Simulator,OS=2.1,name=Apple Vision Pro'
           - 'platform=macOS'
         exclude:
           # Don't run old macOS with new Xcode
-          - runner: macos-13
-            xcode: Xcode_16
+          - runner: macos-14
+            xcode: Xcode_16.1
           # Don't run new macOS with old Xcode
           - 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)'
-            xcode: Xcode_16
+            xcode: Xcode_16.1
           - destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
-            xcode: Xcode_16
+            xcode: Xcode_16.1
           - destination: 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
-            xcode: Xcode_16
+            xcode: Xcode_16.1
           # Don't run new simulators with old Xcode
-          - destination: 'platform=tvOS Simulator,OS=18.0,name=Apple TV 4K (3rd generation) (at 1080p)'
+          - destination: 'platform=tvOS Simulator,OS=18.1,name=Apple TV 4K (3rd generation) (at 1080p)'
             xcode: Xcode_15.2
-          - destination: 'platform=iOS Simulator,OS=18.0,name=iPhone 16'
+          - destination: 'platform=iOS Simulator,OS=18.1,name=iPhone 16'
             xcode: Xcode_15.2
-          - destination: 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro'
+          - destination: 'platform=visionOS Simulator,OS=2.1,name=Apple Vision Pro'
             xcode: Xcode_15.2
     steps:
       - name: Configure Xcode
         run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
-      - name: Install visionOS 2.0 sim
-        if: ${{ matrix.destination == 'platform=visionOS Simulator,OS=2.0,name=Apple Vision Pro' }}
+      - name: Install visionOS sim if needed
+        if: ${{ contains(matrix.destination, 'platform=visionOS') }}
         run: |
           sudo xcodebuild -runFirstLaunch
           sudo xcrun simctl list