From 361d6de16249b41d1922b2aeb6937fbd35cdecc6 Mon Sep 17 00:00:00 2001 From: Hui Zhao Date: Thu, 6 Jun 2024 16:53:09 -0700 Subject: [PATCH] test test test test --- .../callable-e2e-test-specialized.yml | 2 +- .github/workflows/callable-e2e-tests.yml | 68 +++++++++---------- .../callable-release-verification.yml | 2 +- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/callable-e2e-test-specialized.yml b/.github/workflows/callable-e2e-test-specialized.yml index ca47296ee6b..87397c4fc8c 100644 --- a/.github/workflows/callable-e2e-test-specialized.yml +++ b/.github/workflows/callable-e2e-test-specialized.yml @@ -53,7 +53,7 @@ jobs: - name: Run Sample shell: bash working-directory: amplify-js-samples-staging/samples/${{ inputs.framework }}/${{ inputs.category }}/${{ matrix.sample_name }} - run: yarn run:sample + run: yarn run:ci:sample - name: Run tests shell: bash working-directory: amplify-js-samples-staging diff --git a/.github/workflows/callable-e2e-tests.yml b/.github/workflows/callable-e2e-tests.yml index 4bda9cd0eae..5637215c4e8 100644 --- a/.github/workflows/callable-e2e-tests.yml +++ b/.github/workflows/callable-e2e-tests.yml @@ -17,7 +17,7 @@ jobs: echo "INTEG_CONFIG=$(cat .github/integ-config/integ-all.yml | yq '.tests' -o=json | jq -c .)" >> $GITHUB_OUTPUT echo "INTEG_CONFIG_HEADLESS=$(cat .github/integ-config/integ-all-headless.yml | yq '.tests' -o=json | jq -c .)" >> $GITHUB_OUTPUT echo "DETOX_INTEG_CONFIG=$(cat .github/integ-config/detox-integ-all.yml | yq -o=json | jq -c .)" >> $GITHUB_OUTPUT - echo "INTEG_CONFIG_SPECIALIZED=$(cat .github/integ-config/integ-specialized.yml | yq -o=json | jq -c .)" >> $GITHUB_OUTPUT + echo "INTEG_CONFIG_SPECIALIZED=$(cat .github/integ-config/integ-specialized.yml | yq '.tests' -o=json | jq -c .)" >> $GITHUB_OUTPUT working-directory: ./amplify-js outputs: integ-config: ${{ steps.load_config.outputs.INTEG_CONFIG }} @@ -25,26 +25,26 @@ jobs: detox-integ-config: ${{ steps.load_config.outputs.DETOX_INTEG_CONFIG }} integ-specialized-config: ${{ steps.load_config.outputs.INTEG_CONFIG_SPECIALIZED }} - 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) || '[""]' }} - backend: ${{ matrix.integ-config.backend }} - 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) || '[""]' }} + # backend: ${{ matrix.integ-config.backend }} + # 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 @@ -62,19 +62,19 @@ jobs: # timeout_minutes: ${{ matrix.integ-config.timeout_minutes || 35 }} # retry_count: ${{ matrix.integ-config.retry_count || 3 }} - detox-e2e-test-runner: - name: E2E test runner - needs: e2e-prep - strategy: - matrix: - integ-config: ${{ fromJson(needs.e2e-prep.outputs.detox-integ-config) }} - fail-fast: false - secrets: inherit - uses: ./.github/workflows/callable-e2e-test-detox.yml - with: - test_name: ${{ matrix.integ-config.test_name }} - working_directory: ${{ matrix.integ-config.working_directory }} - timeout_minutes: ${{ matrix.integ-config.timeout_minutes || 45 }} + # detox-e2e-test-runner: + # name: E2E test runner + # needs: e2e-prep + # strategy: + # matrix: + # integ-config: ${{ fromJson(needs.e2e-prep.outputs.detox-integ-config) }} + # fail-fast: false + # secrets: inherit + # uses: ./.github/workflows/callable-e2e-test-detox.yml + # with: + # test_name: ${{ matrix.integ-config.test_name }} + # working_directory: ${{ matrix.integ-config.working_directory }} + # timeout_minutes: ${{ matrix.integ-config.timeout_minutes || 45 }} specialized-e2e-test-runner: name: Specialized E2E test runner diff --git a/.github/workflows/callable-release-verification.yml b/.github/workflows/callable-release-verification.yml index 30fd4b0c7e0..55affe44fbe 100644 --- a/.github/workflows/callable-release-verification.yml +++ b/.github/workflows/callable-release-verification.yml @@ -16,7 +16,7 @@ jobs: uses: ./.github/workflows/callable-prebuild-samples-staging.yml e2e: needs: - - prebuild-macos + # - prebuild-macos - prebuild-ubuntu - prebuild-samples-staging secrets: inherit