From 2399fba5dcfe8ca190317fcc0400e5eac1e4e555 Mon Sep 17 00:00:00 2001 From: Niklas Mischkulnig <4586894+mischnic@users.noreply.github.com> Date: Mon, 1 Dec 2025 13:45:47 +0100 Subject: [PATCH 1/3] WIP windows test --- .github/workflows/build_and_test.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 740de70cbfea8..027aa1f073979 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -758,12 +758,14 @@ jobs: # Should this be using turbopack? a variation? afterBuild: | export NEXT_TEST_MODE=dev - export IS_WEBPACK_TEST=1 + export IS_TURBOPACK_TEST=1 + export TURBOPACK_DEV=1 node run-tests.js \ test/e2e/app-dir/app/index.test.ts \ test/e2e/app-dir/app-edge/app-edge.test.ts \ test/e2e/app-dir/proxy-runtime-nodejs/proxy-runtime-nodejs.test.ts \ + test/e2e/externals-transitive/externals-transitive.test.ts \ test/development/app-dir/segment-explorer/segment-explorer.test.ts stepName: 'test-dev-windows' runs_on_labels: '["windows","self-hosted","x64"]' @@ -815,14 +817,16 @@ jobs: with: afterBuild: | export NEXT_TEST_MODE=start - export IS_WEBPACK_TEST=1 + export IS_TURBOPACK_TEST=1 + export TURBOPACK_BUILD=1 node run-tests.js --type production \ test/e2e/app-dir/app/index.test.ts \ test/e2e/app-dir/app-edge/app-edge.test.ts \ test/e2e/app-dir/metadata-edge/index.test.ts \ test/e2e/app-dir/non-root-project-monorepo/non-root-project-monorepo.test.ts \ - test/e2e/app-dir/proxy-runtime-nodejs/proxy-runtime-nodejs.test.ts + test/e2e/app-dir/proxy-runtime-nodejs/proxy-runtime-nodejs.test.ts \ + test/e2e/externals-transitive/externals-transitive.test.ts stepName: 'test-prod-windows' runs_on_labels: '["windows","self-hosted","x64"]' buildNativeTarget: 'x86_64-pc-windows-msvc' From 134e4bfe339f9ed2faabfbe966654c955703e837 Mon Sep 17 00:00:00 2001 From: Niklas Mischkulnig <4586894+mischnic@users.noreply.github.com> Date: Mon, 1 Dec 2025 16:33:41 +0100 Subject: [PATCH 2/3] f --- .github/workflows/build_and_test.yml | 95 ++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 027aa1f073979..312db1b181b67 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -755,7 +755,34 @@ jobs: uses: ./.github/workflows/build_reusable.yml with: - # Should this be using turbopack? a variation? + afterBuild: | + export NEXT_TEST_MODE=dev + export IS_WEBPACK_TEST=1 + + node run-tests.js \ + test/e2e/app-dir/app/index.test.ts \ + test/e2e/app-dir/app-edge/app-edge.test.ts \ + test/e2e/app-dir/proxy-runtime-nodejs/proxy-runtime-nodejs.test.ts \ + test/development/app-dir/segment-explorer/segment-explorer.test.ts + stepName: 'test-dev-windows' + runs_on_labels: '["windows","self-hosted","x64"]' + buildNativeTarget: 'x86_64-pc-windows-msvc' + secrets: inherit + + test-turbopack-dev-windows: + name: test turbopack dev windows + needs: + [ + 'optimize-ci', + 'changes', + 'build-native-windows', + 'build-native', + 'build-next', + ] + if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }} + + uses: ./.github/workflows/build_reusable.yml + with: afterBuild: | export NEXT_TEST_MODE=dev export IS_TURBOPACK_TEST=1 @@ -767,7 +794,7 @@ jobs: test/e2e/app-dir/proxy-runtime-nodejs/proxy-runtime-nodejs.test.ts \ test/e2e/externals-transitive/externals-transitive.test.ts \ test/development/app-dir/segment-explorer/segment-explorer.test.ts - stepName: 'test-dev-windows' + stepName: 'test-turbopack-dev-windows' runs_on_labels: '["windows","self-hosted","x64"]' buildNativeTarget: 'x86_64-pc-windows-msvc' secrets: inherit @@ -801,6 +828,36 @@ jobs: buildNativeTarget: 'x86_64-pc-windows-msvc' secrets: inherit + test-turbopack-integration-windows: + name: test turbopack integration windows + needs: + [ + 'optimize-ci', + 'changes', + 'build-native-windows', + 'build-native', + 'build-next', + ] + if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }} + + uses: ./.github/workflows/build_reusable.yml + with: + nodeVersion: 20.9.0 + afterBuild: | + export IS_TURBOPACK_TEST=1 + + node run-tests.js \ + --concurrency 4 \ + test/production/pages-dir/production/test/index.test.ts \ + test/integration/css-client-nav/test/index.test.ts \ + test/integration/rewrites-has-condition/test/index.test.ts \ + test/integration/create-next-app/index.test.ts \ + test/integration/create-next-app/package-manager/pnpm.test.ts + stepName: 'test-turbopack-integration-windows' + runs_on_labels: '["windows","self-hosted","x64"]' + buildNativeTarget: 'x86_64-pc-windows-msvc' + secrets: inherit + test-prod-windows: name: test prod windows needs: @@ -813,6 +870,35 @@ jobs: ] if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }} + uses: ./.github/workflows/build_reusable.yml + with: + afterBuild: | + export NEXT_TEST_MODE=start + export IS_WEBPACK_TEST=1 + + node run-tests.js --type production \ + test/e2e/app-dir/app/index.test.ts \ + test/e2e/app-dir/app-edge/app-edge.test.ts \ + test/e2e/app-dir/metadata-edge/index.test.ts \ + test/e2e/app-dir/non-root-project-monorepo/non-root-project-monorepo.test.ts \ + test/e2e/app-dir/proxy-runtime-nodejs/proxy-runtime-nodejs.test.ts + stepName: 'test-prod-windows' + runs_on_labels: '["windows","self-hosted","x64"]' + buildNativeTarget: 'x86_64-pc-windows-msvc' + secrets: inherit + + test-turbopack-prod-windows: + name: test turbopack prod windows + needs: + [ + 'optimize-ci', + 'changes', + 'build-native-windows', + 'build-native', + 'build-next', + ] + if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }} + uses: ./.github/workflows/build_reusable.yml with: afterBuild: | @@ -825,9 +911,8 @@ jobs: test/e2e/app-dir/app-edge/app-edge.test.ts \ test/e2e/app-dir/metadata-edge/index.test.ts \ test/e2e/app-dir/non-root-project-monorepo/non-root-project-monorepo.test.ts \ - test/e2e/app-dir/proxy-runtime-nodejs/proxy-runtime-nodejs.test.ts \ - test/e2e/externals-transitive/externals-transitive.test.ts - stepName: 'test-prod-windows' + test/e2e/app-dir/proxy-runtime-nodejs/proxy-runtime-nodejs.test.ts + stepName: 'test-turbopack-prod-windows' runs_on_labels: '["windows","self-hosted","x64"]' buildNativeTarget: 'x86_64-pc-windows-msvc' secrets: inherit From 9920499a0198017d7228296b748e1768bcae7689 Mon Sep 17 00:00:00 2001 From: Niklas Mischkulnig <4586894+mischnic@users.noreply.github.com> Date: Mon, 1 Dec 2025 17:03:23 +0100 Subject: [PATCH 3/3] fixup --- .github/workflows/build_and_test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 312db1b181b67..16426bed79984 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -792,7 +792,6 @@ jobs: test/e2e/app-dir/app/index.test.ts \ test/e2e/app-dir/app-edge/app-edge.test.ts \ test/e2e/app-dir/proxy-runtime-nodejs/proxy-runtime-nodejs.test.ts \ - test/e2e/externals-transitive/externals-transitive.test.ts \ test/development/app-dir/segment-explorer/segment-explorer.test.ts stepName: 'test-turbopack-dev-windows' runs_on_labels: '["windows","self-hosted","x64"]' @@ -1116,8 +1115,11 @@ jobs: 'test-turbopack-production-integration', 'test-unit-windows', 'test-dev-windows', + 'test-turbopack-dev-windows', 'test-integration-windows', + 'test-turbopack-integration-windows', 'test-prod-windows', + 'test-turbopack-prod-windows', ] if: always()