Unverified Commit b87f7b4a authored by Sam Poder's avatar Sam Poder Committed by GitHub

[turbopack] Don't run Webpack tests on Turbopack-only changes (#96656)

Hopefully this saves us money + makes it easier to merge Turbopack PRs
due to flaky Webpack tests
parent 2317b28d
...@@ -43,6 +43,17 @@ jobs: ...@@ -43,6 +43,17 @@ jobs:
echo "$(node scripts/run-for-change.mjs --not --type docs --exec echo 'false')" >> $GITHUB_OUTPUT; echo "$(node scripts/run-for-change.mjs --not --type docs --exec echo 'false')" >> $GITHUB_OUTPUT;
echo 'EOF' >> $GITHUB_OUTPUT echo 'EOF' >> $GITHUB_OUTPUT
- name: check for turbopack only change
id: turbopack-change
run: |
set -euo pipefail
TURBOPACK_ONLY="$(node scripts/run-for-change.mjs --not --type turbopack --exec echo 'false')"
{
echo "TURBOPACK_ONLY<<EOF"
echo "$TURBOPACK_ONLY"
echo 'EOF'
} >> "$GITHUB_OUTPUT"
- name: check for release - name: check for release
id: is-release id: is-release
run: | run: |
...@@ -56,6 +67,12 @@ jobs: ...@@ -56,6 +67,12 @@ jobs:
outputs: outputs:
docs-only: ${{ steps.docs-change.outputs.DOCS_ONLY != 'false' }} docs-only: ${{ steps.docs-change.outputs.DOCS_ONLY != 'false' }}
is-release: ${{ steps.is-release.outputs.IS_RELEASE == 'true' }} is-release: ${{ steps.is-release.outputs.IS_RELEASE == 'true' }}
# Pull requests only, so canary and release run all Webpack tests.
turbopack-only: >-
${{
github.event_name == 'pull_request' &&
steps.turbopack-change.outputs.TURBOPACK_ONLY != 'false'
}}
rspack: >- rspack: >-
${{ ${{
steps.is-release.outputs.IS_RELEASE == 'true' || ( steps.is-release.outputs.IS_RELEASE == 'true' || (
...@@ -823,7 +840,7 @@ jobs: ...@@ -823,7 +840,7 @@ jobs:
'build-next', 'build-next',
'fetch-test-timings', 'fetch-test-timings',
] ]
if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }} if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' && needs.changes.outputs.turbopack-only == 'false' }}
strategy: strategy:
fail-fast: false fail-fast: false
...@@ -932,7 +949,7 @@ jobs: ...@@ -932,7 +949,7 @@ jobs:
'build-next', 'build-next',
'fetch-test-timings', 'fetch-test-timings',
] ]
if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }} if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' && needs.changes.outputs.turbopack-only == 'false' }}
strategy: strategy:
fail-fast: false fail-fast: false
......
...@@ -55,6 +55,15 @@ const CHANGE_ITEM_GROUPS = { ...@@ -55,6 +55,15 @@ const CHANGE_ITEM_GROUPS = {
'test/production/create-next-app', 'test/production/create-next-app',
'scripts/send-trace-to-jaeger', 'scripts/send-trace-to-jaeger',
], ],
// Changes confined to these paths cannot affect a webpack build.
turbopack: [
'turbopack/crates',
'!turbopack/crates/turbo-bincode',
'!turbopack/crates/turbo-rcstr', // also covers turbo-rcstr-macros
'!turbopack/crates/turbo-tasks-hash',
'!turbopack/crates/turbo-tasks-macros',
'!turbopack/crates/turbo-unix-path',
],
} }
async function main() { async function main() {
...@@ -106,6 +115,12 @@ async function main() { ...@@ -106,6 +115,12 @@ async function main() {
).join(', ')}` ).join(', ')}`
) )
} }
// an item prefixed with "!" excludes paths another item matched
const excludedItems = changeItems
.filter((item) => item.startsWith('!'))
.map((item) => item.slice(1))
const includedItems = changeItems.filter((item) => !item.startsWith('!'))
let changedFilesCount = 0 let changedFilesCount = 0
let changedDirectories = new Set() let changedDirectories = new Set()
...@@ -124,13 +139,15 @@ async function main() { ...@@ -124,13 +139,15 @@ async function main() {
// if --not flag is provided we execute for any file changed // if --not flag is provided we execute for any file changed
// not included in the change items otherwise we only execute // not included in the change items otherwise we only execute
// if a change item is changed // if a change item is changed
const matchesItem = changeItems.some((item) => { const matchesItem =
const found = file.startsWith(item) !excludedItems.some((item) => file.startsWith(item)) &&
if (found) { includedItems.some((item) => {
changedDirectories.add(item) const found = file.startsWith(item)
} if (found) {
return found changedDirectories.add(item)
}) }
return found
})
if (!matchesItem && isNegated) { if (!matchesItem && isNegated) {
hasMatchingChange = true hasMatchingChange = true
......
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