Merge branch 'canary' into 11-24-update_status_codes_for_redirect_and…

…_permanentRedirect_in_action_handlers
vercel · Nov 29, 2023 · 5baadc8 · 5baadc8
2 parents 1d2ab51 + 9656f15
commit 5baadc8
Show file tree

Hide file tree

Showing 54 changed files with 837 additions and 381 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -228,7 +228,7 @@ jobs:
 
     name: stable - ${{ matrix.settings.target }} - node@16
     runs-on: ${{ matrix.settings.host }}
-    timeout-minutes: 30
+    timeout-minutes: 45
     steps:
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -183,12 +183,10 @@ jobs:
       fail-fast: false
       matrix:
         group: [1, 2, 3]
-
     uses: ./.github/workflows/build_reusable.yml
     with:
       skipForDocsOnly: 'yes'
       afterBuild: NEXT_TEST_MODE=dev node run-tests.js --timings -g ${{ matrix.group }}/3 -c ${TEST_CONCURRENCY} --type development
-
     secrets: inherit
 
   test-prod:
@@ -198,7 +196,6 @@ jobs:
       fail-fast: false
       matrix:
         group: [1, 2, 3, 4, 5]
-
     uses: ./.github/workflows/build_reusable.yml
     with:
       skipForDocsOnly: 'yes'
@@ -212,7 +209,6 @@ jobs:
       fail-fast: false
       matrix:
         group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
-
     uses: ./.github/workflows/build_reusable.yml
     with:
       nodeVersion: 18.17.0
@@ -230,13 +226,58 @@ jobs:
       afterBuild: pnpm playwright install && BROWSER_NAME=firefox node run-tests.js test/production/pages-dir/production/test/index.test.ts && BROWSER_NAME=safari NEXT_TEST_MODE=start node run-tests.js -c 1 test/production/pages-dir/production/test/index.test.ts test/e2e/basepath.test.ts && BROWSER_NAME=safari DEVICE_NAME='iPhone XR' node run-tests.js -c 1 test/production/prerender-prefetch/index.test.ts
     secrets: inherit
 
+  # TODO: remove these jobs once PPR is the default
+  # Manifest generated via: https://gist.github.com/wyattjoh/2ceaebd82a5bcff4819600fd60126431
+  test-ppr-integration:
+    name: test ppr integration
+    needs: ['build-native', 'build-next']
+    strategy:
+      fail-fast: false
+      matrix:
+        group: [1, 2, 3]
+    uses: ./.github/workflows/build_reusable.yml
+    with:
+      nodeVersion: 18.17.0
+      skipForDocsOnly: 'yes'
+      afterBuild: __NEXT_EXPERIMENTAL_PPR=true NEXT_EXTERNAL_TESTS_FILTERS="test/ppr-tests-manifest.json" node run-tests.js --timings -g ${{ matrix.group }}/3 -c ${TEST_CONCURRENCY} --type integration
+    secrets: inherit
+
+  test-ppr-dev:
+    name: test ppr dev
+    needs: ['build-native', 'build-next']
+    strategy:
+      fail-fast: false
+      matrix:
+        group: [1, 2, 3]
+    uses: ./.github/workflows/build_reusable.yml
+    with:
+      skipForDocsOnly: 'yes'
+      afterBuild: __NEXT_EXPERIMENTAL_PPR=true NEXT_EXTERNAL_TESTS_FILTERS="test/ppr-tests-manifest.json" NEXT_TEST_MODE=dev node run-tests.js --timings -g ${{ matrix.group }}/3 -c ${TEST_CONCURRENCY} --type development
+    secrets: inherit
+
+  test-ppr-prod:
+    name: test ppr prod
+    needs: ['build-native', 'build-next']
+    strategy:
+      fail-fast: false
+      matrix:
+        group: [1, 2, 3]
+    uses: ./.github/workflows/build_reusable.yml
+    with:
+      skipForDocsOnly: 'yes'
+      afterBuild: __NEXT_EXPERIMENTAL_PPR=true NEXT_EXTERNAL_TESTS_FILTERS="test/ppr-tests-manifest.json" NEXT_TEST_MODE=start node run-tests.js --timings -g ${{ matrix.group }}/3 -c ${TEST_CONCURRENCY} --type production
+    secrets: inherit
+
   report-test-results:
     needs:
       [
         'test-unit',
         'test-dev',
         'test-prod',
         'test-integration',
+        'test-ppr-dev',
+        'test-ppr-prod',
+        'test-ppr-integration',
         'test-turbopack-dev',
         'test-turbopack-integration',
       ]
@@ -275,6 +316,9 @@ jobs:
         'test-dev',
         'test-prod',
         'test-integration',
+        'test-ppr-dev',
+        'test-ppr-prod',
+        'test-ppr-integration',
         'test-cargo-unit',
         'test-cargo-integration',
         'test-cargo-bench',