Unverified Commit 55bb48da authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Ensure we only run main test mode with custom deploy script (#90665)

This ensures we don't try running both webpack and turbopack suites or
the report/PR jobs when a custom deploy script is provided.
parent 36cadbf5
...@@ -79,6 +79,7 @@ jobs: ...@@ -79,6 +79,7 @@ jobs:
test-deploy-webpack: test-deploy-webpack:
name: Run Deploy Tests (Webpack) name: Run Deploy Tests (Webpack)
needs: setup needs: setup
if: ${{ github.event.inputs.deployScriptPath == '' }}
uses: ./.github/workflows/build_reusable.yml uses: ./.github/workflows/build_reusable.yml
secrets: inherit secrets: inherit
strategy: strategy:
...@@ -137,6 +138,8 @@ jobs: ...@@ -137,6 +138,8 @@ jobs:
NEXT_EXTERNAL_TESTS_FILTERS="test/deploy-tests-manifest.json" \ NEXT_EXTERNAL_TESTS_FILTERS="test/deploy-tests-manifest.json" \
NEXT_TEST_VERSION="${{ github.event.inputs.nextVersion || needs.setup.outputs.next-version || 'canary' }}" \ NEXT_TEST_VERSION="${{ github.event.inputs.nextVersion || needs.setup.outputs.next-version || 'canary' }}" \
VERCEL_CLI_VERSION="${{ github.event.inputs.vercelCliVersion || 'vercel@latest' }}" \ VERCEL_CLI_VERSION="${{ github.event.inputs.vercelCliVersion || 'vercel@latest' }}" \
NEXT_TEST_DEPLOY_SCRIPT_PATH="${{ github.event.inputs.deployScriptPath || '' }}" \
NEXT_TEST_DEPLOY_LOGS_SCRIPT_PATH="${{ github.event.inputs.deployLogsScriptPath || '' }}" \
node run-tests.js --timings -g ${{ matrix.group }} -c 2 --type e2e node run-tests.js --timings -g ${{ matrix.group }} -c 2 --type e2e
skipNativeBuild: 'yes' skipNativeBuild: 'yes'
skipNativeInstall: 'no' skipNativeInstall: 'no'
...@@ -189,7 +192,7 @@ jobs: ...@@ -189,7 +192,7 @@ jobs:
report-test-results-to-datadog: report-test-results-to-datadog:
needs: [test-deploy-turbopack, test-deploy-webpack] needs: [test-deploy-turbopack, test-deploy-webpack]
if: ${{ always() }} if: ${{ always() && github.event.inputs.deployScriptPath == '' }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Report test results to datadog name: Report test results to datadog
...@@ -280,7 +283,7 @@ jobs: ...@@ -280,7 +283,7 @@ jobs:
update-prs: update-prs:
name: Update prs as ready for review name: Update prs as ready for review
needs: [test-deploy-turbopack, test-deploy-webpack, create-draft-prs] needs: [test-deploy-turbopack, test-deploy-webpack, create-draft-prs]
if: ${{ needs.test-deploy-webpack.result == 'success' && needs.test-deploy-turbopack.result == 'success' && github.repository_owner == 'vercel' && github.event_name == 'release' }} if: ${{ (needs.test-deploy-webpack.result == 'success' || needs.test-deploy-webpack.result == 'skipped') && needs.test-deploy-turbopack.result == 'success' && github.repository_owner == 'vercel' && github.event_name == 'release' }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
fail-fast: false fail-fast: false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment