diff --git a/.github/workflows/build_amplify_swift.yml b/.github/workflows/build_amplify_swift.yml index f22d7097fe..67b5a835b6 100644 --- a/.github/workflows/build_amplify_swift.yml +++ b/.github/workflows/build_amplify_swift.yml @@ -1,4 +1,4 @@ -name: Build | Amplify Swift +name: Build Amplify-Package for the given platform on: workflow_call: inputs: diff --git a/.github/workflows/integ_test_analytics.yml b/.github/workflows/integ_test_analytics.yml index 077173e332..6f0de7f368 100644 --- a/.github/workflows/integ_test_analytics.yml +++ b/.github/workflows/integ_test_analytics.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSPinpointAnalyticsPluginIntegrationTestsWatch' || 'AWSPinpointAnalyticsPluginIntegrationTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSPinpointAnalyticsPlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/Analytics/Tests/AnalyticsHostApp xcode_version: '14.3' resource_subfolder: analytics diff --git a/.github/workflows/integ_test_api_functional.yml b/.github/workflows/integ_test_api_functional.yml index 8bfa3578fb..a63a05eb28 100644 --- a/.github/workflows/integ_test_api_functional.yml +++ b/.github/workflows/integ_test_api_functional.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSAPIPluginFunctionalTestsWatch' || 'AWSAPIPluginFunctionalTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSAPIPlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api diff --git a/.github/workflows/integ_test_api_graphql_auth_directive.yml b/.github/workflows/integ_test_api_graphql_auth_directive.yml index 5b0d66eed3..33dba6c1d5 100644 --- a/.github/workflows/integ_test_api_graphql_auth_directive.yml +++ b/.github/workflows/integ_test_api_graphql_auth_directive.yml @@ -32,7 +32,6 @@ jobs: with: scheme: AWSAPIPluginGraphQLAuthDirectiveTests platform: ${{ matrix.platform }} - build_cache_key: AWSAPIPlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api diff --git a/.github/workflows/integ_test_api_graphql_iam.yml b/.github/workflows/integ_test_api_graphql_iam.yml index f112bd58fe..e1631664ea 100644 --- a/.github/workflows/integ_test_api_graphql_iam.yml +++ b/.github/workflows/integ_test_api_graphql_iam.yml @@ -32,7 +32,6 @@ jobs: with: scheme: AWSAPIPluginGraphQLIAMTests platform: ${{ matrix.platform }} - build_cache_key: AWSAPIPlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api diff --git a/.github/workflows/integ_test_api_graphql_lambda_auth.yml b/.github/workflows/integ_test_api_graphql_lambda_auth.yml index ad52c3efa3..49388053a2 100644 --- a/.github/workflows/integ_test_api_graphql_lambda_auth.yml +++ b/.github/workflows/integ_test_api_graphql_lambda_auth.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSAPIPluginGraphQLLambdaAuthTestsWatch' || 'AWSAPIPluginGraphQLLambdaAuthTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSAPIPlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api diff --git a/.github/workflows/integ_test_api_graphql_user_pool.yml b/.github/workflows/integ_test_api_graphql_user_pool.yml index b85fe21d29..21f1205eb6 100644 --- a/.github/workflows/integ_test_api_graphql_user_pool.yml +++ b/.github/workflows/integ_test_api_graphql_user_pool.yml @@ -32,7 +32,6 @@ jobs: with: scheme: AWSAPIPluginGraphQLUserPoolTests platform: ${{ matrix.platform }} - build_cache_key: AWSAPIPlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api diff --git a/.github/workflows/integ_test_api_rest_iam.yml b/.github/workflows/integ_test_api_rest_iam.yml index f3fb951ccf..18a14615bf 100644 --- a/.github/workflows/integ_test_api_rest_iam.yml +++ b/.github/workflows/integ_test_api_rest_iam.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSAPIPluginRESTIAMTestsWatch' || 'AWSAPIPluginRESTIAMTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSAPIPlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api diff --git a/.github/workflows/integ_test_auth.yml b/.github/workflows/integ_test_auth.yml index a7b09c7a10..e90900e0ee 100644 --- a/.github/workflows/integ_test_auth.yml +++ b/.github/workflows/integ_test_auth.yml @@ -43,7 +43,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AuthIntegrationTestsWatch' || 'AuthIntegrationTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSCognitoAuthPlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/Auth/Tests/AuthHostApp/ xcode_version: '14.3' resource_subfolder: auth @@ -56,7 +55,6 @@ jobs: with: scheme: AuthHostedUIApp platform: iOS - build_cache_key: AWSCognitoAuthPlugin-iOS-latest-build-main project_path: ./AmplifyPlugins/Auth/Tests/AuthHostedUIApp/ xcode_version: '14.3' resource_subfolder: auth diff --git a/.github/workflows/integ_test_datastore_auth_cognito.yml b/.github/workflows/integ_test_datastore_auth_cognito.yml index f2df091a00..cd611d7f82 100644 --- a/.github/workflows/integ_test_datastore_auth_cognito.yml +++ b/.github/workflows/integ_test_datastore_auth_cognito.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSDataStorePluginAuthCognitoTestsWatch' || 'AWSDataStorePluginAuthCognitoTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSDataStorePlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore diff --git a/.github/workflows/integ_test_datastore_base.yml b/.github/workflows/integ_test_datastore_base.yml index bf63cdd76a..5a3ca820df 100644 --- a/.github/workflows/integ_test_datastore_base.yml +++ b/.github/workflows/integ_test_datastore_base.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSDataStorePluginIntegrationTestsWatch' || 'AWSDataStorePluginIntegrationTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSDataStorePlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore diff --git a/.github/workflows/integ_test_datastore_cpk.yml b/.github/workflows/integ_test_datastore_cpk.yml index 1d5f08c728..350def730c 100644 --- a/.github/workflows/integ_test_datastore_cpk.yml +++ b/.github/workflows/integ_test_datastore_cpk.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSDataStorePluginCPKTestsWatch' || 'AWSDataStorePluginCPKTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSDataStorePlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore diff --git a/.github/workflows/integ_test_datastore_lazy_load.yml b/.github/workflows/integ_test_datastore_lazy_load.yml index e4887198ac..c54e405359 100644 --- a/.github/workflows/integ_test_datastore_lazy_load.yml +++ b/.github/workflows/integ_test_datastore_lazy_load.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSDataStorePluginLazyLoadTestsWatch' || 'AWSDataStorePluginLazyLoadTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSDataStorePlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore diff --git a/.github/workflows/integ_test_datastore_multi_auth.yml b/.github/workflows/integ_test_datastore_multi_auth.yml index f3592564bc..df5ccd69bd 100644 --- a/.github/workflows/integ_test_datastore_multi_auth.yml +++ b/.github/workflows/integ_test_datastore_multi_auth.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSDataStorePluginMultiAuthTestsWatch' || 'AWSDataStorePluginMultiAuthTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSDataStorePlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore diff --git a/.github/workflows/integ_test_datastore_v2.yml b/.github/workflows/integ_test_datastore_v2.yml index 76b9cd50f1..1b44b75248 100644 --- a/.github/workflows/integ_test_datastore_v2.yml +++ b/.github/workflows/integ_test_datastore_v2.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSDataStorePluginV2TestsWatch' || 'AWSDataStorePluginV2Tests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSDataStorePlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore diff --git a/.github/workflows/integ_test_geo.yml b/.github/workflows/integ_test_geo.yml index 82278c3900..2bc9cb0ced 100644 --- a/.github/workflows/integ_test_geo.yml +++ b/.github/workflows/integ_test_geo.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSLocationGeoPluginIntegrationTestsWatch' || 'AWSLocationGeoPluginIntegrationTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSLocationGeoPlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/Geo/Tests/GeoHostApp/ xcode_version: '14.3' resource_subfolder: geo diff --git a/.github/workflows/integ_test_logging.yml b/.github/workflows/integ_test_logging.yml index 4fdd1a6d75..f9fcdf14a4 100644 --- a/.github/workflows/integ_test_logging.yml +++ b/.github/workflows/integ_test_logging.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSCloudWatchLoggingPluginIntegrationTestsWatch' || 'AWSCloudWatchLoggingPluginIntegrationTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSCloudWatchLoggingPlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/Logging/Tests/AWSCloudWatchLoggingPluginHostApp xcode_version: ${{ matrix.platform == 'watchOS' && '15.0' || '14.3' }} resource_subfolder: logging diff --git a/.github/workflows/integ_test_predictions.yml b/.github/workflows/integ_test_predictions.yml index 44d321edf6..7cf53e3378 100644 --- a/.github/workflows/integ_test_predictions.yml +++ b/.github/workflows/integ_test_predictions.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSPredictionsPluginIntegrationTestsWatch' || 'AWSPredictionsPluginIntegrationTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSPredictionsPlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/Predictions/Tests/PredictionsHostApp xcode_version: '14.3' resource_subfolder: predictions diff --git a/.github/workflows/integ_test_storage.yml b/.github/workflows/integ_test_storage.yml index 76f186365b..22fc5bb90e 100644 --- a/.github/workflows/integ_test_storage.yml +++ b/.github/workflows/integ_test_storage.yml @@ -38,7 +38,6 @@ jobs: with: scheme: ${{ matrix.platform == 'watchOS' && 'AWSS3StoragePluginIntegrationTestsWatch' || 'AWSS3StoragePluginIntegrationTests' }} platform: ${{ matrix.platform }} - build_cache_key: AWSS3StoragePlugin-${{ matrix.platform }}-latest-build-main project_path: ./AmplifyPlugins/Storage/Tests/StorageHostApp/ xcode_version: '14.3' resource_subfolder: storage diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml index a96200bc3b..500f10095a 100644 --- a/.github/workflows/run_integration_tests.yml +++ b/.github/workflows/run_integration_tests.yml @@ -25,10 +25,6 @@ on: required: false type: number default: 30 - build_cache_key: - description: 'The key used to retrieve the build cache' - required: true - type: string permissions: id-token: write @@ -77,14 +73,14 @@ jobs: restore-keys: | amplify-packages- - - name: Attempt to use the provided build cache + - name: Attempt to restore the build cache id: build-cache timeout-minutes: 4 continue-on-error: true uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 with: path: ${{ github.workspace }}/Build - key: ${{ inputs.build_cache_key }} + key: Amplify-${{ inputs.platform }}-build-cache - name: Run ${{ inputs.platform }} Integration Tests id: run-tests diff --git a/.github/workflows/run_unit_tests_platforms.yml b/.github/workflows/run_unit_tests_platforms.yml index df1f5ed05b..f5df65aafa 100644 --- a/.github/workflows/run_unit_tests_platforms.yml +++ b/.github/workflows/run_unit_tests_platforms.yml @@ -19,7 +19,6 @@ on: permissions: contents: read - actions: write jobs: run-unit-tests: diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index a63ff287ca..7873f7b5d8 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -35,7 +35,6 @@ on: permissions: contents: read - actions: write concurrency: group: ${{ inputs.identifier || github.workflow }}-${{ github.event.pull_request.number || github.ref }}