From 2fad9512ecdd5f0591dd419c861212598b792bd9 Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:43:58 -0400 Subject: [PATCH] using 15.2 for corepredictions tests --- .../get_platform_parameters/action.yml | 18 ++++++++---------- .github/workflows/run_unit_tests_platforms.yml | 3 ++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/composite_actions/get_platform_parameters/action.yml b/.github/composite_actions/get_platform_parameters/action.yml index 9fa928a9c5..6c5dd3760f 100644 --- a/.github/composite_actions/get_platform_parameters/action.yml +++ b/.github/composite_actions/get_platform_parameters/action.yml @@ -39,8 +39,7 @@ 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 }} @@ -48,13 +47,7 @@ runs: 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 index 972a4e64dd..edfd321c9b 100644 --- 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 }} \ No newline at end of file + os-runner: ${{ inputs.os-runner }} + xcode_version: ${{ inputs.os-runner == 'macos-13' && '15.2' || 'latest' }} \ No newline at end of file