From 2f36ebbc42be62cbc87859e7d25dd88782c11958 Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:16:02 -0400 Subject: [PATCH] chore: Revamping Unit Tests workflows --- .github/workflows/build_amplify_swift.yml | 175 ++------ .../build_amplify_swift_for_testing.yml | 68 --- .../build_amplify_swift_platforms.yml | 66 +++ .github/workflows/build_and_test_amplify.yml | 196 --------- .github/workflows/deploy_package.yml | 2 +- .../workflows/nightly_repeated_unittest.yml | 2 +- .github/workflows/run_unit_tests.yml | 26 +- .../run_xcodebuild_test_platforms.yml | 405 +----------------- .github/workflows/unit_test.yml | 25 +- .github/workflows/unit_test_amplify.yml | 2 +- .github/workflows/unit_test_analytics.yml | 2 +- .github/workflows/unit_test_api.yml | 2 +- .github/workflows/unit_test_auth.yml | 2 +- .github/workflows/unit_test_core.yml | 2 +- .github/workflows/unit_test_datastore.yml | 2 +- .github/workflows/unit_test_geo.yml | 2 +- .../workflows/unit_test_internal_pinpoint.yml | 2 +- .github/workflows/unit_test_logging.yml | 2 +- .github/workflows/unit_test_predictions.yml | 4 +- .../unit_test_push_notifications.yml | 2 +- .github/workflows/unit_test_storage.yml | 2 +- 21 files changed, 168 insertions(+), 823 deletions(-) delete mode 100644 .github/workflows/build_amplify_swift_for_testing.yml create mode 100644 .github/workflows/build_amplify_swift_platforms.yml delete mode 100644 .github/workflows/build_and_test_amplify.yml diff --git a/.github/workflows/build_amplify_swift.yml b/.github/workflows/build_amplify_swift.yml index 35ed0b77f3..573b4cc4fe 100644 --- a/.github/workflows/build_amplify_swift.yml +++ b/.github/workflows/build_amplify_swift.yml @@ -2,32 +2,33 @@ name: Build | Amplify Swift on: workflow_call: inputs: - identifier: - required: true + platform: type: string - workflow_dispatch: - push: - branches-ignore: - - main - - release + required: true permissions: - contents: read - -concurrency: - group: ${{ inputs.identifier || github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: ${{ github.ref_name != 'main'}} + contents: read + actions: write jobs: - build-amplify-swift-iOS: + build-amplify-swift: + name: Build Amplify-Package | ${{ inputs.platform }} runs-on: macos-13 - timeout-minutes: 20 steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3 + - name: Checkout repository + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3 with: persist-credentials: false - - name: Attempt to restore dependencies cache - id: cache-packages + + - name: Get build parameters for ${{ inputs.platform }} + id: platform + uses: ./.github/composite_actions/get_platform_parameters + with: + platform: ${{ inputs.platform }} + xcode_version: '14.3' + + - name: Attempt to use the dependencies cache + id: dependencies-cache timeout-minutes: 4 continue-on-error: true uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 @@ -36,131 +37,47 @@ jobs: key: amplify-packages-${{ hashFiles('Package.resolved') }} restore-keys: | amplify-packages- - - name: Build Amplify Swift for iOS - uses: ./.github/composite_actions/run_xcodebuild - with: - scheme: Amplify-Package - destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' - xcode_path: '/Applications/Xcode_14.3.app' - disable_package_resolution: ${{ steps.cache-packages.outputs.cache-hit }} - other_flags: '-derivedDataPath Build -clonedSourcePackagesDirPath ~/Library/Developer/Xcode/DerivedData/Amplify' - - name: Save the dependencies cache if necessary - if: steps.cache-packages.outputs.cache-hit != 'true' && github.ref_name == 'main' - uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ~/Library/Developer/Xcode/DerivedData/Amplify - key: ${{ steps.cache-packages.outputs.cache-primary-key }} - build-amplify-swift-macOS: - runs-on: macos-13 - timeout-minutes: 20 - steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3 - with: - persist-credentials: false - - name: Attempt to restore dependencies cache - id: cache-packages + - name: Attempt to restore the build cache from main + id: build-cache timeout-minutes: 4 continue-on-error: true uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 with: - path: ~/Library/Developer/Xcode/DerivedData/Amplify - key: amplify-packages-${{ hashFiles('Package.resolved') }} - restore-keys: | - amplify-packages- - - name: Build Amplify Swift for macOS - uses: ./.github/composite_actions/run_xcodebuild - with: - scheme: Amplify-Package - destination: platform=macOS,arch=x86_64 - sdk: macosx - xcode_path: '/Applications/Xcode_14.3.app' - disable_package_resolution: ${{ steps.cache-packages.outputs.cache-hit }} - other_flags: '-derivedDataPath Build -clonedSourcePackagesDirPath ~/Library/Developer/Xcode/DerivedData/Amplify' - - name: Save the dependencies cache if necessary - if: steps.cache-packages.outputs.cache-hit != 'true' && github.ref_name == 'main' - uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ~/Library/Developer/Xcode/DerivedData/Amplify - key: ${{ steps.cache-packages.outputs.cache-primary-key }} + path: ${{ github.workspace }}/Build + key: Amplify-${{ inputs.platform }}-build-cache - build-amplify-swift-tvOS: - runs-on: macos-13 - timeout-minutes: 20 - steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3 - with: - persist-credentials: false - - name: Attempt to restore dependencies cache - timeout-minutes: 4 - id: cache-packages + - name: Build Amplify for Swift + id: build-package continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ~/Library/Developer/Xcode/DerivedData/Amplify - key: amplify-packages-${{ hashFiles('Package.resolved') }} - restore-keys: | - amplify-packages- - - name: Build Amplify Swift for tvOS uses: ./.github/composite_actions/run_xcodebuild with: scheme: Amplify-Package - destination: platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=16.4 - sdk: appletvsimulator - xcode_path: '/Applications/Xcode_14.3.app' - disable_package_resolution: ${{ steps.cache-packages.outputs.cache-hit }} - other_flags: '-derivedDataPath Build -clonedSourcePackagesDirPath ~/Library/Developer/Xcode/DerivedData/Amplify' - - name: Save the dependencies cache if necessary - if: steps.cache-packages.outputs.cache-hit != 'true' && github.ref_name == 'main' + destination: ${{ steps.platform.outputs.destination }} + sdk: ${{ steps.platform.outputs.sdk }} + xcode_path: /Applications/Xcode_14.3.app + cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify + derived_data_path: ${{ github.workspace }}/Build + disable_package_resolution: ${{ steps.dependencies-cache.outputs.cache-hit }} + + - name: Save the dependencies cache in main + if: steps.dependencies-cache.outputs.cache-hit != 'true' && github.ref_name == 'main' uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 with: path: ~/Library/Developer/Xcode/DerivedData/Amplify - key: ${{ steps.cache-packages.outputs.cache-primary-key }} - - build-amplify-swift-watchOS: - runs-on: macos-13 - timeout-minutes: 20 - steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3 - with: - persist-credentials: false - - name: Attempt to restore dependencies cache - id: cache-packages - timeout-minutes: 4 + key: ${{ steps.dependencies-cache.outputs.cache-primary-key }} + + - name: Delete the old build cache on main + if: steps.build-cache.outputs.cache-hit # && github.ref_name == 'main' + env: + GH_TOKEN: ${{ github.token }} continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ~/Library/Developer/Xcode/DerivedData/Amplify - key: amplify-packages-${{ hashFiles('Package.resolved') }} - restore-keys: | - amplify-packages- - - name: Build Amplify Swift for watchOS - uses: ./.github/composite_actions/run_xcodebuild - with: - scheme: Amplify-Package - destination: platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=9.4 - sdk: watchsimulator - xcode_path: '/Applications/Xcode_14.3.app' - disable_package_resolution: ${{ steps.cache-packages.outputs.cache-hit }} - other_flags: '-derivedDataPath Build -clonedSourcePackagesDirPath ~/Library/Developer/Xcode/DerivedData/Amplify' - - name: Save the dependencies cache if necessary - if: steps.cache-packages.outputs.cache-hit != 'true' && github.ref_name == 'main' + run: | + gh cache delete ${{ steps.build-cache.outputs.cache-primary-key }} + + - name: Save the build cache in the main + #if: github.ref_name == 'main' uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 with: - path: ~/Library/Developer/Xcode/DerivedData/Amplify - key: ${{ steps.cache-packages.outputs.cache-primary-key }} - - confirm-pass: - runs-on: ubuntu-latest - name: Confirm Passing Build Steps - if: ${{ !cancelled() }} - needs: [ - build-amplify-swift-iOS, - build-amplify-swift-macOS, - build-amplify-swift-tvOS, - build-amplify-swift-watchOS - ] - env: - EXIT_CODE: ${{ contains(needs.*.result, 'failure') && 1 || 0 }} - steps: - - run: exit $EXIT_CODE + path: ${{ github.workspace }}/Build + key: ${{ steps.build-cache.outputs.cache-primary-key }} \ No newline at end of file diff --git a/.github/workflows/build_amplify_swift_for_testing.yml b/.github/workflows/build_amplify_swift_for_testing.yml deleted file mode 100644 index e542612008..0000000000 --- a/.github/workflows/build_amplify_swift_for_testing.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: Build the Amplify Package for Testing -on: - workflow_call: - inputs: - platform: - type: string - required: true - -permissions: - contents: read - actions: write - -jobs: - build-amplify-swift: - name: Build Amplify-Package | ${{ inputs.platform }} - runs-on: macos-13 - steps: - - name: Checkout repository - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3 - with: - persist-credentials: false - - - name: Get build parameters for ${{ inputs.platform }} - id: platform - uses: ./.github/composite_actions/get_platform_parameters - with: - platform: ${{ inputs.platform }} - xcode_version: '14.3' - - - name: Attempt to use the dependencies cache - id: dependencies-cache - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ~/Library/Developer/Xcode/DerivedData/Amplify - key: amplify-packages-${{ hashFiles('Package.resolved') }} - restore-keys: | - amplify-packages- - - - name: Attempt to restore the build cache from main - id: build-cache - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: Amplify-${{ inputs.platform }}-cache-main - - - name: Build Amplify-Package for Testing - id: build-package - continue-on-error: true - uses: ./.github/composite_actions/run_xcodebuild - with: - scheme: Amplify-Package - destination: ${{ steps.platform.outputs.destination }} - sdk: ${{ steps.platform.outputs.sdk }} - xcode_path: /Applications/Xcode_14.3.app - cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify - derived_data_path: ${{ github.workspace }}/Build - disable_package_resolution: ${{ steps.dependencies-cache.outputs.cache-hit }} - build_for_testing: false - - - name: Save the build cache - uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: Amplify-${{ inputs.platform }}-cache-${{ github.ref_name }} \ No newline at end of file diff --git a/.github/workflows/build_amplify_swift_platforms.yml b/.github/workflows/build_amplify_swift_platforms.yml new file mode 100644 index 0000000000..8e5ed80e31 --- /dev/null +++ b/.github/workflows/build_amplify_swift_platforms.yml @@ -0,0 +1,66 @@ +name: Build | Amplify Swift +on: + workflow_call: + inputs: + identifier: + required: true + type: string + workflow_dispatch: + inputs: + ios: + description: '📱 iOS' + required: true + default: true + type: boolean + macos: + description: '💻 macOS' + required: true + default: true + type: boolean + tvos: + description: '📺 tvOS' + required: true + default: true + type: boolean + watchos: + description: '⌚️ watchOS' + required: true + default: true + type: boolean + push: + branches-ignore: + - main + - release + +permissions: + contents: read + +concurrency: + group: ${{ inputs.identifier || github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: ${{ github.ref_name != 'main'}} + +jobs: + build-amplify-swift: + name: Build Amplify Swift + strategy: + fail-fast: false + matrix: + platform: [iOS, macOS, tvOS, watchOS] + exclude: + - platform: ${{ github.event.inputs.ios == 'false' && 'iOS' || 'None' }} + - platform: ${{ github.event.inputs.macos == 'false' && 'macOS' || 'None' }} + - platform: ${{ github.event.inputs.tvos == 'false' && 'tvOS' || 'None' }} + - platform: ${{ github.event.inputs.watchos == 'false' && 'watchOS' || 'None' }} + uses: ./.github/workflows/build_amplify_swift.yml + with: + platform: ${{ matrix.platform }} + + confirm-pass: + runs-on: ubuntu-latest + name: Confirm Passing Build Steps + if: ${{ !cancelled() }} + needs: [ build-amplify-swift ] + env: + EXIT_CODE: ${{ contains(needs.*.result, 'failure') && 1 || 0 }} + steps: + - run: exit $EXIT_CODE diff --git a/.github/workflows/build_and_test_amplify.yml b/.github/workflows/build_and_test_amplify.yml deleted file mode 100644 index 08c70fc890..0000000000 --- a/.github/workflows/build_and_test_amplify.yml +++ /dev/null @@ -1,196 +0,0 @@ -name: Build and Test the Amplify Package -on: - - push - -permissions: - contents: read - actions: write - -jobs: - build-amplify-swift-iOS: - name: Build Amplify for Swift - uses: ./.github/workflows/build_amplify_swift_for_testing.yml - with: - platform: iOS - - build-amplify-swift-macOS: - name: Build Amplify for Swift - uses: ./.github/workflows/build_amplify_swift_for_testing.yml - with: - platform: macOS - - build-amplify-swift-tvOS: - name: Build Amplify for Swift - uses: ./.github/workflows/build_amplify_swift_for_testing.yml - with: - platform: tvOS - - build-amplify-swift-watchOS: - name: Build Amplify for Swift - uses: ./.github/workflows/build_amplify_swift_for_testing.yml - with: - platform: watchOS - - run-unit-tests-iOS: - name: ${{ matrix.scheme }} Unit Tests - needs: [build-amplify-swift-iOS] - strategy: - fail-fast: false - matrix: - scheme: [ - Amplify, - AWSPluginsCore, - AWSAPIPlugin, - AWSCloudWatchLoggingPlugin, - AWSCognitoAuthPlugin, - AWSDataStorePlugin, - AWSLocationGeoPlugin, - AWSPredictionsPlugin, - AWSPinpointAnalyticsPlugin, - AWSPinpointPushNotificationsPlugin, - AWSS3StoragePlugin, - CoreMLPredictionsPlugin, - InternalAWSPinpointUnitTests - ] - uses: ./.github/workflows/run_unit_tests.yml - with: - scheme: ${{ matrix.scheme }} - platform: iOS - xcode_version: '14.3' - generate_coverage_report: ${{ matrix.scheme != 'InternalAWSPinpointUnitTests' }} - build_cache_key: Amplify-iOS-cache-${{ github.ref_name }} - test_without_building: true - delete_build_cache_on_success: ${{ github.ref_name != 'main'}} - - run-unit-tests-macOS: - name: ${{ matrix.scheme }} Unit Tests - needs: [build-amplify-swift-macOS] - strategy: - fail-fast: false - matrix: - scheme: [ - Amplify, - AWSPluginsCore, - AWSAPIPlugin, - AWSCloudWatchLoggingPlugin, - AWSCognitoAuthPlugin, - AWSDataStorePlugin, - AWSLocationGeoPlugin, - AWSPredictionsPlugin, - AWSPinpointAnalyticsPlugin, - AWSPinpointPushNotificationsPlugin, - AWSS3StoragePlugin, - CoreMLPredictionsPlugin, - InternalAWSPinpointUnitTests - ] - uses: ./.github/workflows/run_unit_tests.yml - with: - scheme: ${{ matrix.scheme }} - platform: macOS - xcode_version: '14.3' - generate_coverage_report: false - build_cache_key: Amplify-macOS-cache-${{ github.ref_name }} - test_without_building: true - delete_build_cache_on_success: ${{ github.ref_name != 'main'}} - - run-unit-tests-tvOS: - name: ${{ matrix.scheme }} Unit Tests - needs: [build-amplify-swift-tvOS] - strategy: - fail-fast: false - matrix: - scheme: [ - Amplify, - AWSPluginsCore, - AWSAPIPlugin, - AWSCloudWatchLoggingPlugin, - AWSCognitoAuthPlugin, - AWSDataStorePlugin, - AWSLocationGeoPlugin, - AWSPredictionsPlugin, - AWSPinpointAnalyticsPlugin, - AWSPinpointPushNotificationsPlugin, - AWSS3StoragePlugin, - CoreMLPredictionsPlugin, - InternalAWSPinpointUnitTests - ] - uses: ./.github/workflows/run_unit_tests.yml - with: - scheme: ${{ matrix.scheme }} - platform: tvOS - xcode_version: '14.3' - generate_coverage_report: false - build_cache_key: Amplify-tvOS-cache-${{ github.ref_name }} - test_without_building: true - delete_build_cache_on_success: ${{ github.ref_name != 'main'}} - - run-unit-tests-watchOS: - name: ${{ matrix.scheme }} Unit Tests - needs: [build-amplify-swift-watchOS] - strategy: - fail-fast: false - matrix: - scheme: [ - Amplify, - AWSPluginsCore, - AWSAPIPlugin, - AWSCloudWatchLoggingPlugin, - AWSCognitoAuthPlugin, - AWSDataStorePlugin, - AWSLocationGeoPlugin, - AWSPredictionsPlugin, - AWSPinpointAnalyticsPlugin, - AWSPinpointPushNotificationsPlugin, - AWSS3StoragePlugin, - CoreMLPredictionsPlugin, - InternalAWSPinpointUnitTests - ] - uses: ./.github/workflows/run_unit_tests.yml - with: - scheme: ${{ matrix.scheme }} - platform: watchOS - xcode_version: '14.3' - generate_coverage_report: false - build_cache_key: Amplify-watchOS-cache-${{ github.ref_name }} - test_without_building: true - delete_build_cache_on_success: ${{ github.ref_name != 'main'}} - - report-coverage: - name: ${{ matrix.file.scheme }} Unit Tests - needs: [run-unit-tests-iOS] - strategy: - fail-fast: false - matrix: - file: [ - { scheme: Amplify, flags: 'Amplify,unit_tests' }, - { scheme: AWSPluginsCore, flags: 'AWSPluginsCore,unit_tests' }, - { scheme: AWSAPIPlugin, flags: 'API_plugin_unit_test,unit_tests' }, - { scheme: AWSCloudWatchLoggingPlugin, flags: 'Logging_plugin_unit_test,unit_tests' }, - { scheme: AWSCognitoAuthPlugin, flags: 'Auth_plugin_unit_test,unit_tests' }, - { scheme: AWSDataStorePlugin, flags: 'DataStore_plugin_unit_test,unit_tests' }, - { scheme: AWSLocationGeoPlugin, flags: 'Geo_plugin_unit_test,unit_tests' }, - { scheme: AWSPredictionsPlugin, flags: 'Predictions_plugin_unit_test,unit_tests' }, - { scheme: AWSPinpointAnalyticsPlugin, flags: 'Analytics_plugin_unit_test,unit_tests' }, - { scheme: AWSPinpointPushNotificationsPlugin, flags: 'PushNotifications_plugin_unit_test,unit_tests' }, - { scheme: AWSS3StoragePlugin, flags: 'Storage_plugin_unit_test,unit_tests' }, - { scheme: CoreMLPredictionsPlugin, flags: 'CoreMLPredictions_plugin_unit_test,unit_tests' } - ] - uses: ./.github/workflows/upload_coverage_report.yml - with: - scheme: ${{ matrix.file.scheme }} - flags: ${{ matrix.file.flags }} - - unit-test-pass-confirmation: - runs-on: ubuntu-latest - name: Confirm Passing Unit Tests - if: ${{ !cancelled() }} - needs: [ - run-unit-tests-iOS, - run-unit-tests-macOS, - run-unit-tests-tvOS, - run-unit-tests-watchOS - ] - env: - EXIT_CODE: ${{ contains(needs.*.result, 'failure') && 1 || 0 }} - steps: - - run: exit $EXIT_CODE diff --git a/.github/workflows/deploy_package.yml b/.github/workflows/deploy_package.yml index 209bcf863a..37e6b7c75e 100644 --- a/.github/workflows/deploy_package.yml +++ b/.github/workflows/deploy_package.yml @@ -16,7 +16,7 @@ permissions: jobs: build-amplify-swift: name: Build Amplify package - uses: ./.github/workflows/build_amplify_swift.yml + uses: ./.github/workflows/build_amplify_swift_platforms.yml with: identifier: 'workflow-call-build-amplify-swift' diff --git a/.github/workflows/nightly_repeated_unittest.yml b/.github/workflows/nightly_repeated_unittest.yml index fbd3be44d5..c5e6aa151a 100644 --- a/.github/workflows/nightly_repeated_unittest.yml +++ b/.github/workflows/nightly_repeated_unittest.yml @@ -32,7 +32,7 @@ jobs: CoreMLPredictionsPlugin, InternalAWSPinpointUnitTests ] - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: ${{ matrix.scheme }} timeout-minutes: 50 diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml index 6383499913..b928704eb7 100644 --- a/.github/workflows/run_unit_tests.yml +++ b/.github/workflows/run_unit_tests.yml @@ -27,19 +27,6 @@ on: required: false type: boolean default: false - build_cache_key: - description: 'The key used to retrieve the build cache' - required: false - default: '' - type: string - test_without_building: - type: boolean - required: false - default: false - delete_build_cache_on_success: - required: false - type: boolean - default: false permissions: contents: read @@ -81,7 +68,7 @@ jobs: uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 with: path: ${{ github.workspace }}/Build - key: ${{ inputs.build_cache_key || format('{0}-{1}-latest-build-main', inputs.scheme, inputs.platform) }} + key: Amplify-${{ inputs.platform }}-build-cache - name: Run ${{ inputs.platform }} Unit Tests id: run-tests @@ -96,7 +83,6 @@ jobs: cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify derived_data_path: ${{ github.workspace }}/Build disable_package_resolution: ${{ steps.dependencies-cache.outputs.cache-hit }} - test_without_building: ${{ inputs.test_without_building && steps.dependencies-cache.outputs.cache-hit }} other_flags: -test-iterations 3 -retry-tests-on-failure - name: Retry ${{ inputs.platform }} Unit Tests @@ -113,18 +99,8 @@ jobs: cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify derived_data_path: ${{ github.workspace }}/Build disable_package_resolution: true - test_without_building: ${{ inputs.test_without_building && steps.dependencies-cache.outputs.cache-hit}} other_flags: -test-iterations 3 -retry-tests-on-failure - - name: Delete the build cache - if: ${{ inputs.delete_build_cache_on_success && steps.build-cache.outputs.cache-hit }} - env: - GH_TOKEN: ${{ github.token }} - continue-on-error: true - run: | - gh cache delete ${{ steps.build-cache.outputs.cache-primary-key }} - shell: bash - - name: Store Coverage Report File if: ${{ inputs.generate_coverage_report == true }} uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2 diff --git a/.github/workflows/run_xcodebuild_test_platforms.yml b/.github/workflows/run_xcodebuild_test_platforms.yml index f0cc1c07b3..94d05ab1e9 100644 --- a/.github/workflows/run_xcodebuild_test_platforms.yml +++ b/.github/workflows/run_xcodebuild_test_platforms.yml @@ -35,391 +35,20 @@ permissions: actions: write jobs: - test-iOS: - name: iOS Tests | ${{ inputs.scheme }} - runs-on: macos-13 - timeout-minutes: ${{ inputs.timeout-minutes }} - steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3 - with: - persist-credentials: false - - name: Attempt to restore dependencies cache - id: cache-packages - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ~/Library/Developer/Xcode/DerivedData/Amplify - key: amplify-packages-${{ hashFiles('Package.resolved') }} - restore-keys: | - amplify-packages- - - name: Attempt to restore the build cache for this SHA - id: restore-build - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ env.SCHEME }}-iOS-build-${{ github.sha }} - restore-keys: | - ${{ env.SCHEME }}-iOS-build- - - name: Attempt to restore the build cache from main - if: steps.restore-build.outputs.cache-hit != 'true' - id: restore-main-build - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ env.SCHEME }}-iOS-latest-build-main - - name: Run iOS Test Suite - id: run-tests - continue-on-error: ${{ env.RETRY_ON_ERROR == 'true' }} - uses: ./.github/composite_actions/run_xcodebuild_test - with: - scheme: ${{ env.SCHEME }} - destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' - xcode_path: '/Applications/Xcode_14.3.app' - generate_coverage: ${{ inputs.generate_coverage_report }} - cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify - derived_data_path: ${{ github.workspace }}/Build - disable_package_resolution: ${{ steps.cache-packages.outputs.cache-hit }} - test_without_building: ${{ steps.restore-build.outputs.cache-hit }} - other_flags: ${{ inputs.other_flags }} - - name: Retry iOS Test Suite if needed - if: inputs.retry_on_error == true && steps.run-tests.outcome=='failure' - id: retry-tests - uses: ./.github/composite_actions/run_xcodebuild_test - with: - scheme: ${{ env.SCHEME }} - destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' - xcode_path: '/Applications/Xcode_14.3.app' - generate_coverage: ${{ inputs.generate_coverage_report }} - cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify - derived_data_path: ${{ github.workspace }}/Build - disable_package_resolution: true - # Only test without building when this exact SHA was cached or we did not restore the build from main. - test_without_building: ${{ steps.restore-build.outputs.cache-hit || !steps.restore-main-build.outputs.cache-hit }} - other_flags: ${{ inputs.other_flags }} - - name: Save the SHA build cache for re-runs - if: failure() && steps.retry-tests.outcome=='failure' - uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ env.SCHEME }}-iOS-build-${{ github.sha }} - - name: Delete the SHA build cache on re-run success - if: steps.restore-build.outputs.cache-matched-key - env: - GH_TOKEN: ${{ github.token }} - continue-on-error: true - run: | - gh cache delete ${{ steps.restore-build.outputs.cache-matched-key }} - shell: bash - - name: Delete the old build cache on main - if: github.ref_name == 'main' && steps.restore-main-build.outputs.cache-hit - env: - GH_TOKEN: ${{ github.token }} - continue-on-error: true - run: | - gh cache delete ${{ steps.restore-main-build.outputs.cache-primary-key }} - shell: bash - - name: Save the new build cache on main - if: github.ref_name == 'main' - uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ steps.restore-main-build.outputs.cache-primary-key }} - - name: Upload Report File - if: ${{ inputs.generate_coverage_report == true }} - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2 - with: - name: ${{ env.SCHEME }}-Coverage-${{ github.sha }} - path: ${{ github.workspace }}/${{ env.SCHEME }}-Coverage.lcov - if-no-files-found: error - retention-days: 1 - - - test-macOS: - name: macOS Tests | ${{ inputs.scheme }} - runs-on: macos-13 - timeout-minutes: ${{ inputs.timeout-minutes }} - steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3 - with: - persist-credentials: false - - name: Attempt to restore dependencies cache - id: cache-packages - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ~/Library/Developer/Xcode/DerivedData/Amplify - key: amplify-packages-${{ hashFiles('Package.resolved') }} - restore-keys: | - amplify-packages- - - name: Attempt to restore the build cache for this SHA - id: restore-build - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ env.SCHEME }}-macOS-build-${{ github.sha }} - restore-keys: | - ${{ env.SCHEME }}-macOS-build- - - name: Attempt to restore the build cache from main - if: steps.restore-build.outputs.cache-hit != 'true' - id: restore-main-build - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ env.SCHEME }}-macOS-latest-build-main - - name: Run macOS Test Suite - id: run-tests - continue-on-error: ${{ env.RETRY_ON_ERROR == 'true' }} - uses: ./.github/composite_actions/run_xcodebuild_test - with: - scheme: ${{ env.SCHEME }} - destination: platform=macOS,arch=x86_64 - sdk: macosx - xcode_path: '/Applications/Xcode_14.3.app' - cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify - derived_data_path: ${{ github.workspace }}/Build - disable_package_resolution: ${{ steps.cache-packages.outputs.cache-hit }} - test_without_building: ${{ steps.restore-build.outputs.cache-hit }} - other_flags: ${{ inputs.other_flags }} - - name: Retry macOS Test Suite if needed - if: inputs.retry_on_error == true && steps.run-tests.outcome=='failure' - id: retry-tests - uses: ./.github/composite_actions/run_xcodebuild_test - with: - scheme: ${{ env.SCHEME }} - destination: platform=macOS,arch=x86_64 - sdk: macosx - xcode_path: '/Applications/Xcode_14.3.app' - cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify - derived_data_path: ${{ github.workspace }}/Build - disable_package_resolution: true - # Only test without building when this exact SHA was cached or we did not restore the build from main. - test_without_building: ${{ steps.restore-build.outputs.cache-hit || !steps.restore-main-build.outputs.cache-hit }} - other_flags: ${{ inputs.other_flags }} - - name: Save the SHA build cache for re-runs - if: failure() && steps.retry-tests.outcome=='failure' - uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ env.SCHEME }}-macOS-build-${{ github.sha }} - - name: Delete the SHA build cache on re-run success - if: steps.restore-build.outputs.cache-matched-key - env: - GH_TOKEN: ${{ github.token }} - continue-on-error: true - run: | - gh cache delete ${{ steps.restore-build.outputs.cache-matched-key }} - shell: bash - - name: Delete the old build cache on main - if: github.ref_name == 'main' && steps.restore-main-build.outputs.cache-hit - env: - GH_TOKEN: ${{ github.token }} - continue-on-error: true - run: | - gh cache delete ${{ steps.restore-main-build.outputs.cache-primary-key }} - shell: bash - - name: Save the new build cache on main - if: github.ref_name == 'main' - uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ steps.restore-main-build.outputs.cache-primary-key }} - - test-tvOS: - name: tvOS Tests | ${{ inputs.scheme }} - runs-on: macos-13 - timeout-minutes: ${{ inputs.timeout-minutes }} - steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3 - with: - persist-credentials: false - - name: Attempt to restore dependencies cache - id: cache-packages - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ~/Library/Developer/Xcode/DerivedData/Amplify - key: amplify-packages-${{ hashFiles('Package.resolved') }} - restore-keys: | - amplify-packages- - - name: Attempt to restore the build cache for this SHA - id: restore-build - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ env.SCHEME }}-tvOS-build-${{ github.sha }} - restore-keys: | - ${{ env.SCHEME }}-tvOS-build- - - name: Attempt to restore the build cache from main - if: steps.restore-build.outputs.cache-hit != 'true' - id: restore-main-build - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ env.SCHEME }}-tvOS-latest-build-main - - name: Run tvOS Test Suite - id: run-tests - continue-on-error: ${{ env.RETRY_ON_ERROR == 'true' }} - uses: ./.github/composite_actions/run_xcodebuild_test - with: - scheme: ${{ env.SCHEME }} - destination: platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=16.4 - sdk: appletvsimulator - xcode_path: '/Applications/Xcode_14.3.app' - cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify - derived_data_path: ${{ github.workspace }}/Build - disable_package_resolution: ${{ steps.cache-packages.outputs.cache-hit }} - test_without_building: ${{ steps.restore-build.outputs.cache-hit }} - other_flags: ${{ inputs.other_flags }} - - name: Retry tvOS Test Suite if needed - if: inputs.retry_on_error == true && steps.run-tests.outcome=='failure' - id: retry-tests - uses: ./.github/composite_actions/run_xcodebuild_test - with: - scheme: ${{ env.SCHEME }} - destination: platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=16.4 - sdk: appletvsimulator - xcode_path: '/Applications/Xcode_14.3.app' - cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify - derived_data_path: ${{ github.workspace }}/Build - disable_package_resolution: true - # Only test without building when this exact SHA was cached or we did not restore the build from main. - test_without_building: ${{ steps.restore-build.outputs.cache-hit || !steps.restore-main-build.outputs.cache-hit }} - other_flags: ${{ inputs.other_flags }} - - name: Save the SHA build cache for re-runs - if: failure() && steps.retry-tests.outcome=='failure' - uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ env.SCHEME }}-tvOS-build-${{ github.sha }} - - name: Delete the SHA build cache on re-run success - if: steps.restore-build.outputs.cache-matched-key - env: - GH_TOKEN: ${{ github.token }} - continue-on-error: true - run: | - gh cache delete ${{ steps.restore-build.outputs.cache-matched-key }} - shell: bash - - name: Delete the old build cache on main - if: github.ref_name == 'main' && steps.restore-main-build.outputs.cache-hit - env: - GH_TOKEN: ${{ github.token }} - continue-on-error: true - run: | - gh cache delete ${{ steps.restore-main-build.outputs.cache-primary-key }} - shell: bash - - name: Save the new build cache on main - if: github.ref_name == 'main' - uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ steps.restore-main-build.outputs.cache-primary-key }} - - test-watchOS: - name: watchOS Tests | ${{ inputs.scheme }} - runs-on: macos-13 - timeout-minutes: ${{ inputs.timeout-minutes }} - steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3 - with: - persist-credentials: false - - name: Attempt to restore dependencies cache - id: cache-packages - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ~/Library/Developer/Xcode/DerivedData/Amplify - key: amplify-packages-${{ hashFiles('Package.resolved') }} - restore-keys: | - amplify-packages- - - name: Attempt to restore the build cache for this SHA - id: restore-build - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ env.SCHEME }}-watchOS-build-${{ github.sha }} - restore-keys: | - ${{ env.SCHEME }}-watchOS-build- - - name: Attempt to restore the build cache from main - if: steps.restore-build.outputs.cache-hit != 'true' - id: restore-main-build - timeout-minutes: 4 - continue-on-error: true - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ env.SCHEME }}-watchOS-latest-build-main - - name: Run watchOS Test Suite - id: run-tests - continue-on-error: ${{ env.RETRY_ON_ERROR == 'true' }} - uses: ./.github/composite_actions/run_xcodebuild_test - with: - scheme: ${{ env.SCHEME }} - destination: platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=9.4 - sdk: watchsimulator - xcode_path: '/Applications/Xcode_14.3.app' - cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify - derived_data_path: ${{ github.workspace }}/Build - disable_package_resolution: ${{ steps.cache-packages.outputs.cache-hit }} - test_without_building: ${{ steps.restore-build.outputs.cache-hit }} - other_flags: ${{ inputs.other_flags }} - - name: Retry watchOS Test Suite if needed - if: inputs.retry_on_error == true && steps.run-tests.outcome=='failure' - id: retry-tests - uses: ./.github/composite_actions/run_xcodebuild_test - with: - scheme: ${{ env.SCHEME }} - destination: platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=9.4 - sdk: watchsimulator - xcode_path: '/Applications/Xcode_14.3.app' - cloned_source_packages_path: ~/Library/Developer/Xcode/DerivedData/Amplify - derived_data_path: ${{ github.workspace }}/Build - disable_package_resolution: true - # Only test without building when this exact SHA was cached or we did not restore the build from main. - test_without_building: ${{ steps.restore-build.outputs.cache-hit || !steps.restore-main-build.outputs.cache-hit }} - other_flags: ${{ inputs.other_flags }} - - name: Save the SHA build cache for re-runs - if: failure() && steps.retry-tests.outcome=='failure' - uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ env.SCHEME }}-watchOS-build-${{ github.sha }} - - name: Delete the SHA build cache on re-run success - if: steps.restore-build.outputs.cache-matched-key - env: - GH_TOKEN: ${{ github.token }} - continue-on-error: true - run: | - gh cache delete ${{ steps.restore-build.outputs.cache-matched-key }} - shell: bash - - name: Delete the old build cache on main - if: github.ref_name == 'main' && steps.restore-main-build.outputs.cache-hit - env: - GH_TOKEN: ${{ github.token }} - continue-on-error: true - run: | - gh cache delete ${{ steps.restore-main-build.outputs.cache-primary-key }} - shell: bash - - name: Save the new build cache on main - if: github.ref_name == 'main' - uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: ${{ github.workspace }}/Build - key: ${{ steps.restore-main-build.outputs.cache-primary-key }} + run-unit-tests: + name: ${{ matrix.platform }} Tests | ${{ inputs.scheme }} + strategy: + fail-fast: false + matrix: + platform: [iOS, macOS, tvOS, watchOS] + exclude: + - platform: ${{ github.event.inputs.ios == 'false' && 'iOS' || 'None' }} + - platform: ${{ github.event.inputs.macos == 'false' && 'macOS' || 'None' }} + - platform: ${{ github.event.inputs.tvos == 'false' && 'tvOS' || 'None' }} + - platform: ${{ github.event.inputs.watchos == 'false' && 'watchOS' || 'None' }} + uses: ./.github/workflows/run_unit_tests.yml + with: + scheme: ${{ inputs.scheme }} + platform: ${{ matrix.platform }} + xcode_version: '14.3' + generate_coverage_report: ${{ inputs.generate_coverage_report }} \ No newline at end of file diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index 8890dc68cd..a63ff287ca 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -7,6 +7,27 @@ on: type: string workflow_dispatch: + inputs: + ios: + description: '📱 iOS' + required: true + default: true + type: boolean + macos: + description: '💻 macOS' + required: true + default: true + type: boolean + tvos: + description: '📺 tvOS' + required: true + default: true + type: boolean + watchos: + description: '⌚️ watchOS' + required: true + default: true + type: boolean push: branches-ignore: - main @@ -29,7 +50,7 @@ jobs: scheme: [ InternalAWSPinpointUnitTests ] - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: ${{ matrix.scheme }} generate_coverage_report: false @@ -53,7 +74,7 @@ jobs: AWSS3StoragePlugin, CoreMLPredictionsPlugin ] - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: ${{ matrix.scheme }} generate_coverage_report: true diff --git a/.github/workflows/unit_test_amplify.yml b/.github/workflows/unit_test_amplify.yml index 9003e6fcf1..ee804ba5d6 100644 --- a/.github/workflows/unit_test_amplify.yml +++ b/.github/workflows/unit_test_amplify.yml @@ -7,6 +7,6 @@ permissions: jobs: amplify-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: Amplify diff --git a/.github/workflows/unit_test_analytics.yml b/.github/workflows/unit_test_analytics.yml index bd2c7e45a9..6e9dd34447 100644 --- a/.github/workflows/unit_test_analytics.yml +++ b/.github/workflows/unit_test_analytics.yml @@ -7,6 +7,6 @@ permissions: jobs: analytics-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: AWSPinpointAnalyticsPlugin diff --git a/.github/workflows/unit_test_api.yml b/.github/workflows/unit_test_api.yml index b62bb2f030..e6f80a82ca 100644 --- a/.github/workflows/unit_test_api.yml +++ b/.github/workflows/unit_test_api.yml @@ -7,6 +7,6 @@ permissions: jobs: api-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: AWSAPIPlugin diff --git a/.github/workflows/unit_test_auth.yml b/.github/workflows/unit_test_auth.yml index 67148635b3..64e216a7bb 100644 --- a/.github/workflows/unit_test_auth.yml +++ b/.github/workflows/unit_test_auth.yml @@ -7,6 +7,6 @@ permissions: jobs: auth-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: AWSCognitoAuthPlugin diff --git a/.github/workflows/unit_test_core.yml b/.github/workflows/unit_test_core.yml index 271087d9ce..2d47f069d8 100644 --- a/.github/workflows/unit_test_core.yml +++ b/.github/workflows/unit_test_core.yml @@ -7,6 +7,6 @@ permissions: jobs: core-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: AWSPluginsCore diff --git a/.github/workflows/unit_test_datastore.yml b/.github/workflows/unit_test_datastore.yml index 95c4e5a036..1c7fcf1edb 100644 --- a/.github/workflows/unit_test_datastore.yml +++ b/.github/workflows/unit_test_datastore.yml @@ -7,6 +7,6 @@ permissions: jobs: datastore-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: AWSDataStorePlugin diff --git a/.github/workflows/unit_test_geo.yml b/.github/workflows/unit_test_geo.yml index 4a78110b87..89acd2f32c 100644 --- a/.github/workflows/unit_test_geo.yml +++ b/.github/workflows/unit_test_geo.yml @@ -7,6 +7,6 @@ permissions: jobs: geo-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: AWSLocationGeoPlugin diff --git a/.github/workflows/unit_test_internal_pinpoint.yml b/.github/workflows/unit_test_internal_pinpoint.yml index 413c7f8fa3..c521d61722 100644 --- a/.github/workflows/unit_test_internal_pinpoint.yml +++ b/.github/workflows/unit_test_internal_pinpoint.yml @@ -7,6 +7,6 @@ permissions: jobs: internal-pinpoint-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: InternalAWSPinpointUnitTests diff --git a/.github/workflows/unit_test_logging.yml b/.github/workflows/unit_test_logging.yml index 23697a599f..f395d62063 100644 --- a/.github/workflows/unit_test_logging.yml +++ b/.github/workflows/unit_test_logging.yml @@ -7,6 +7,6 @@ permissions: jobs: logging-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: AWSCloudWatchLoggingPlugin diff --git a/.github/workflows/unit_test_predictions.yml b/.github/workflows/unit_test_predictions.yml index 0ea128a720..0315e0960b 100644 --- a/.github/workflows/unit_test_predictions.yml +++ b/.github/workflows/unit_test_predictions.yml @@ -7,11 +7,11 @@ permissions: jobs: predictions-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: AWSPredictionsPlugin coreml-predictions-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: CoreMLPredictionsPlugin diff --git a/.github/workflows/unit_test_push_notifications.yml b/.github/workflows/unit_test_push_notifications.yml index 4e6e26469b..4f0991ccdd 100644 --- a/.github/workflows/unit_test_push_notifications.yml +++ b/.github/workflows/unit_test_push_notifications.yml @@ -7,6 +7,6 @@ permissions: jobs: push-notifications-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: AWSPinpointPushNotificationsPlugin diff --git a/.github/workflows/unit_test_storage.yml b/.github/workflows/unit_test_storage.yml index d17439e906..dbdba90154 100644 --- a/.github/workflows/unit_test_storage.yml +++ b/.github/workflows/unit_test_storage.yml @@ -7,6 +7,6 @@ permissions: jobs: storage-unit-tests: - uses: ./.github/workflows/run_xcodebuild_test_platforms.yml + uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: AWSS3StoragePlugin