Skip to content

Commit 55bb48d

Browse files
authored
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.
1 parent 36cadbf commit 55bb48d

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

.github/workflows/test_e2e_deploy_release.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ jobs:
7979
test-deploy-webpack:
8080
name: Run Deploy Tests (Webpack)
8181
needs: setup
82+
if: ${{ github.event.inputs.deployScriptPath == '' }}
8283
uses: ./.github/workflows/build_reusable.yml
8384
secrets: inherit
8485
strategy:
@@ -137,6 +138,8 @@ jobs:
137138
NEXT_EXTERNAL_TESTS_FILTERS="test/deploy-tests-manifest.json" \
138139
NEXT_TEST_VERSION="${{ github.event.inputs.nextVersion || needs.setup.outputs.next-version || 'canary' }}" \
139140
VERCEL_CLI_VERSION="${{ github.event.inputs.vercelCliVersion || 'vercel@latest' }}" \
141+
NEXT_TEST_DEPLOY_SCRIPT_PATH="${{ github.event.inputs.deployScriptPath || '' }}" \
142+
NEXT_TEST_DEPLOY_LOGS_SCRIPT_PATH="${{ github.event.inputs.deployLogsScriptPath || '' }}" \
140143
node run-tests.js --timings -g ${{ matrix.group }} -c 2 --type e2e
141144
skipNativeBuild: 'yes'
142145
skipNativeInstall: 'no'
@@ -189,7 +192,7 @@ jobs:
189192

190193
report-test-results-to-datadog:
191194
needs: [test-deploy-turbopack, test-deploy-webpack]
192-
if: ${{ always() }}
195+
if: ${{ always() && github.event.inputs.deployScriptPath == '' }}
193196

194197
runs-on: ubuntu-latest
195198
name: Report test results to datadog
@@ -280,7 +283,7 @@ jobs:
280283
update-prs:
281284
name: Update prs as ready for review
282285
needs: [test-deploy-turbopack, test-deploy-webpack, create-draft-prs]
283-
if: ${{ needs.test-deploy-webpack.result == 'success' && needs.test-deploy-turbopack.result == 'success' && github.repository_owner == 'vercel' && github.event_name == 'release' }}
286+
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' }}
284287
runs-on: ubuntu-latest
285288
strategy:
286289
fail-fast: false

0 commit comments

Comments
 (0)