using 15.2 for corepredictions tests

aws-amplify · Apr 30, 2024 · 2fad951 · 2fad951
1 parent 470702f
commit 2fad951
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/.github/composite_actions/get_platform_parameters/action.yml b/.github/composite_actions/get_platform_parameters/action.yml
@@ -39,22 +39,15 @@ runs:
     - id: get-xcode-version
       run: |
         LATEST_XCODE_VERSION=15.3.0
-        MINIMUM_XCODE_VERSION_IOS_MAC=15.0.1
-        MINIMUM_XCODE_VERSION_WATCH_TV=15.0.1
+        MINIMUM_XCODE_VERSION=15.0.1
 
         INPUT_XCODE_VERSION=${{ inputs.xcode_version }}
 
         case $INPUT_XCODE_VERSION in
           latest)
             XCODE_VERSION=$LATEST_XCODE_VERSION ;;
           minimum)
-            INPUT_PLATFORM=${{ inputs.platform }}
-            case $INPUT_PLATFORM in
-              iOS|macOS)
-                XCODE_VERSION=$MINIMUM_XCODE_VERSION_IOS_MAC ;;
-              tvOS|watchOS)
-                XCODE_VERSION=$MINIMUM_XCODE_VERSION_WATCH_TV ;;
-            esac ;;
+            XCODE_VERSION=$MINIMUM_XCODE_VERSION ;;
           *)
             XCODE_VERSION=$INPUT_XCODE_VERSION ;;
         esac
@@ -84,7 +77,12 @@ runs:
         }'
 
         if [ -z "$INPUT_DESTINATION" ]; then
-          DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".\"$INPUT_XCODE_VERSION\".$INPUT_PLATFORM")
+          case $INPUT_XCODE_VERSION in
+            latest|minimum)
+              DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".\"$INPUT_XCODE_VERSION\".$INPUT_PLATFORM") ;;
+            *)
+              DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".\"latest\".$INPUT_PLATFORM") ;;
+          esac
         else
           DESTINATION=$INPUT_DESTINATION
         fi

diff --git a/.github/workflows/run_unit_tests_platforms.yml b/.github/workflows/run_unit_tests_platforms.yml
@@ -48,4 +48,5 @@ jobs:
       generate_coverage_report: ${{ github.event_name != 'workflow_dispatch' && matrix.platform == 'iOS' && inputs.generate_coverage_report }}
       timeout-minutes: ${{ inputs.timeout-minutes }}
       test_iterations_flags: ${{ inputs.test_iterations_flags }}
-      os-runner: ${{ inputs.os-runner }}
+      os-runner: ${{ inputs.os-runner }}
+      xcode_version: ${{ inputs.os-runner == 'macos-13' && '15.2' || 'latest' }}