From 983626de7b94dcd7c8169417e469704e04ab2321 Mon Sep 17 00:00:00 2001 From: David McAfee Date: Tue, 5 Mar 2024 15:56:19 -0800 Subject: [PATCH] revert temp config --- .github/integ-config/detox-integ-all.yml | 24 +++++++-------- .github/workflows/callable-e2e-tests.yml | 38 ++++++++++++------------ .github/workflows/push-preid-release.yml | 21 ++++++------- 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/.github/integ-config/detox-integ-all.yml b/.github/integ-config/detox-integ-all.yml index ba742346371..d4c895c252c 100644 --- a/.github/integ-config/detox-integ-all.yml +++ b/.github/integ-config/detox-integ-all.yml @@ -1,15 +1,15 @@ -# - test_name: 'integ_rn_ios_storage' -# working_directory: amplify-js-samples-staging/samples/react-native/storage/StorageApp -# timeout_minutes: 120 -# - test_name: 'integ_rn_ios_storage_multipart_progress' -# working_directory: amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress -# timeout_minutes: 120 -# - test_name: 'integ_rn_ios_device_tracking' -# working_directory: amplify-js-samples-staging/samples/react-native/auth/deviceTracking -# timeout_minutes: 120 -# - test_name: 'integ_rn_ios_datastore_sqlite_adapter' -# working_directory: amplify-js-samples-staging/samples/react-native/datastore/SQLiteAdapter -# timeout_minutes: 120 +- test_name: 'integ_rn_ios_storage' + working_directory: amplify-js-samples-staging/samples/react-native/storage/StorageApp + timeout_minutes: 120 +- test_name: 'integ_rn_ios_storage_multipart_progress' + working_directory: amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress + timeout_minutes: 120 +- test_name: 'integ_rn_ios_device_tracking' + working_directory: amplify-js-samples-staging/samples/react-native/auth/deviceTracking + timeout_minutes: 120 +- test_name: 'integ_rn_ios_datastore_sqlite_adapter' + working_directory: amplify-js-samples-staging/samples/react-native/datastore/SQLiteAdapter + timeout_minutes: 120 - test_name: 'integ_rn_ios_api_gen2_rn_72_detox_cli' working_directory: amplify-js-samples-staging/samples/react-native/api/gen2/ApiGraphQLGen2 timeout_minutes: 120 diff --git a/.github/workflows/callable-e2e-tests.yml b/.github/workflows/callable-e2e-tests.yml index 0925f85dab7..93459f49a9e 100644 --- a/.github/workflows/callable-e2e-tests.yml +++ b/.github/workflows/callable-e2e-tests.yml @@ -23,25 +23,25 @@ jobs: integ-config-headless: ${{ steps.load_config.outputs.INTEG_CONFIG_HEADLESS }} detox-integ-config: ${{ steps.load_config.outputs.DETOX_INTEG_CONFIG }} - # e2e-test-runner: - # name: E2E test runnner - # needs: e2e-prep - # secrets: inherit - # strategy: - # matrix: - # integ-config: ${{ fromJson(needs.e2e-prep.outputs.integ-config) }} - # fail-fast: false - # uses: ./.github/workflows/callable-e2e-test.yml - # with: - # test_name: ${{ matrix.integ-config.test_name }} - # framework: ${{ matrix.integ-config.framework }} - # category: ${{ matrix.integ-config.category }} - # spec: ${{ matrix.integ-config.spec || '' }} - # amplifyjs_dir: ${{ matrix.integ-config.amplifyjs_dir || false }} - # sample_name: ${{ toJSON(matrix.integ-config.sample_name) || '[""]' }} - # browser: ${{ toJSON(matrix.integ-config.browser) || '[""]' }} - # timeout_minutes: ${{ matrix.integ-config.timeout_minutes || 35 }} - # retry_count: ${{ matrix.integ-config.retry_count || 3 }} + e2e-test-runner: + name: E2E test runnner + needs: e2e-prep + secrets: inherit + strategy: + matrix: + integ-config: ${{ fromJson(needs.e2e-prep.outputs.integ-config) }} + fail-fast: false + uses: ./.github/workflows/callable-e2e-test.yml + with: + test_name: ${{ matrix.integ-config.test_name }} + framework: ${{ matrix.integ-config.framework }} + category: ${{ matrix.integ-config.category }} + spec: ${{ matrix.integ-config.spec || '' }} + amplifyjs_dir: ${{ matrix.integ-config.amplifyjs_dir || false }} + sample_name: ${{ toJSON(matrix.integ-config.sample_name) || '[""]' }} + browser: ${{ toJSON(matrix.integ-config.browser) || '[""]' }} + timeout_minutes: ${{ matrix.integ-config.timeout_minutes || 35 }} + retry_count: ${{ matrix.integ-config.retry_count || 3 }} # e2e-test-runner-headless: # name: E2E test runnner_headless diff --git a/.github/workflows/push-preid-release.yml b/.github/workflows/push-preid-release.yml index f9f53976dd0..6a02989f78f 100644 --- a/.github/workflows/push-preid-release.yml +++ b/.github/workflows/push-preid-release.yml @@ -25,13 +25,14 @@ jobs: run: echo "preid=$(echo $BRANCH | tr -cd '[:alnum:]_\-/.' | cut -d \/ -f 2)" >> $GITHUB_OUTPUT outputs: preid: ${{ steps.output_preid.outputs.preid }} -# preid-release: -# needs: -# - e2e -# - parse-preid -# secrets: inherit -# uses: ./.github/workflows/callable-npm-publish-preid.yml -# # The preid should be detected from the branch name recommending feat/{PREID}/whatever as branch naming pattern -# # if your branch doesn't follow this pattern, you can override it here for your branch. -# with: -# preid: ${{ needs.parse-preid.outputs.preid }} + + preid-release: + needs: + - e2e + - parse-preid + secrets: inherit + uses: ./.github/workflows/callable-npm-publish-preid.yml + # The preid should be detected from the branch name recommending feat/{PREID}/whatever as branch naming pattern + # if your branch doesn't follow this pattern, you can override it here for your branch. + with: + preid: ${{ needs.parse-preid.outputs.preid }}