Updating Xcode and OS versions

aws-amplify · Jan 10, 2025 · 3dab8bf · 3dab8bf
1 parent a4e9b0f
commit 3dab8bf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/composite_actions/get_platform_parameters/action.yml b/.github/composite_actions/get_platform_parameters/action.yml
@@ -41,7 +41,7 @@ runs:
 
     - id: get-xcode-version
       run: |
-        LATEST_XCODE_VERSION=16.0.0
+        LATEST_XCODE_VERSION=16.2.0
         MINIMUM_XCODE_VERSION=15.0.1
 
         INPUT_XCODE_VERSION=${{ inputs.xcode_version }}
@@ -67,31 +67,31 @@ runs:
         case $INPUT_PLATFORM/$INPUT_XCODE_VERSION in
           iOS/latest) 
             DEVICE="iPhone 16"
-            OS_VERSION="18.0"
+            OS_VERSION="18.2"
             ;;
           iOS/*)
-            DEVICE="iPhone 14"
-            OS_VERSION="17.0.1"
+            DEVICE="iPhone 15"
+            OS_VERSION="17.0"
             ;;
           tvOS/latest)
             DEVICE="Apple TV 4K (3rd generation)"
-            OS_VERSION="18.0"
+            OS_VERSION="18.2"
             ;;
           tvOS/*)
             DEVICE="Apple TV 4K (3rd generation)"
             OS_VERSION="17.0"
             ;;
           watchOS/latest)
             DEVICE="Apple Watch Series 10 (46mm)"
-            OS_VERSION="11.0"
+            OS_VERSION="11.2"
             ;;
           watchOS/*)
-            DEVICE="Apple Watch Series 8 (45mm)"
+            DEVICE="Apple Watch Series 7 (45mm)"
             OS_VERSION="10.0"
             ;;
           visionOS/latest)
             DEVICE="Apple Vision Pro"
-            OS_VERSION="2.0"
+            OS_VERSION="2.2"
             ;;
           visionOS/*)
             DEVICE="Apple Vision Pro"

diff --git a/.github/workflows/integ_test_push_notifications.yml b/.github/workflows/integ_test_push_notifications.yml
@@ -26,7 +26,7 @@ permissions:
 jobs:
   push-notification-integration-tests:
     name: ${{ matrix.platform }} Tests | PushNotificationHostApp
-    runs-on: macos-latest
+    runs-on: macos-15
     timeout-minutes: 30
     environment: IntegrationTest
     strategy:
@@ -79,6 +79,7 @@ jobs:
 
       - name: Attempt to restore the build cache
         id: build-cache
+        if: steps.dependencies-cache.outputs.cache-hit
         timeout-minutes: 4
         continue-on-error: true
         uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1

diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml
@@ -82,6 +82,7 @@ jobs:
 
       - name: Attempt to restore the build cache
         id: build-cache
+        if: steps.dependencies-cache.outputs.cache-hit
         timeout-minutes: 4
         continue-on-error: true
         uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1