Merge branch 'canary' into shu/b830

vercel · Dec 5, 2023 · cef6e47 · cef6e47
2 parents 28b6161 + 2003f5f
commit cef6e47
Show file tree

Hide file tree

Showing 144 changed files with 3,298 additions and 2,216 deletions.
diff --git a/.github/workflows/nextjs-integration-test.yml b/.github/workflows/nextjs-integration-test.yml
@@ -23,9 +23,7 @@ env:
   RUST_BACKTRACE: 0
   NEXT_TELEMETRY_DISABLED: 1
   TEST_CONCURRENCY: 6
-  DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
   NEXT_JUNIT_TEST_REPORT: 'true'
-  DD_ENV: 'ci'
   # Turbopack specific customization for the test runner
   TURBOPACK: 1
   __INTERNAL_CUSTOM_TURBOPACK_BINDINGS: ${{ github.workspace }}/packages/next-swc/native/next-swc.linux-x64-gnu.node
@@ -78,17 +76,15 @@ jobs:
           corepack enable
           corepack prepare --activate yarn@1.22.19
 
+      - name: Setup playwright
+        run: |
+          pnpm playwright install
+
       - name: Run test/development
         run: |
-          ls $NEXT_TEST_SKIP_RETRY_MANIFEST
-          sudo npx playwright install-deps && pnpm playwright install
-          NEXT_TEST_MODE=dev TURBOPACK=1 node run-tests.js -g ${{ matrix.group }}/3 -c ${TEST_CONCURRENCY} --type development
-          ls test/turbopack-test-junit-report
+          NEXT_TEST_MODE=dev TURBOPACK=1 node run-tests.js -g ${{ matrix.group }}/6 -c ${TEST_CONCURRENCY} --type development
         # It is currently expected to fail some of next.js integration test, do not fail CI check.
         continue-on-error: true
-        env:
-          # marker to parse log output, do not delete / change.
-          NEXT_INTEGRATION_TEST: true
 
       - name: Upload test report artifacts
         uses: actions/upload-artifact@v3
@@ -125,14 +121,14 @@ jobs:
           corepack enable
           corepack prepare --activate yarn@1.22.19
 
+      - name: Setup playwright
+        run: |
+          pnpm playwright install
+
       - name: Run test/integration
         run: |
-          sudo npx playwright install-deps && pnpm playwright install
           TURBOPACK=1 node run-tests.js -g ${{ matrix.group }}/12 -c ${TEST_CONCURRENCY} --type integration
-          ls test/turbopack-test-junit-report
         continue-on-error: true
-        env:
-          NEXT_INTEGRATION_TEST: true
 
       - name: Upload test report artifacts
         uses: actions/upload-artifact@v3
@@ -192,6 +188,9 @@ jobs:
           path: test/reports
 
       - name: Upload to datadog
+        env:
+          DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
+          DD_ENV: 'ci'
         run: |
           # We'll tag this to the "Turbopack" datadog service, not "nextjs"
-          DD_ENV=ci npx @datadog/datadog-ci@2.23.1 junit upload --tags test.type:turbopack.daily --service Turbopack ./test/reports
+          npx @datadog/datadog-ci@2.23.1 junit upload --tags test.type:turbopack.daily --service Turbopack ./test/reports
diff --git a/.github/workflows/retry_test.yml b/.github/workflows/retry_test.yml
@@ -31,7 +31,7 @@ jobs:
 
   report-failure:
     name: report failure to slack
-    if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt >= 3 && github.repository == 'vercel/next.js' }}
+    if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt >= 3 && !github.event.workflow_run.head_repository.fork }}
     runs-on: ubuntu-latest
     steps:
       - name: send webhook

diff --git a/.github/workflows/upload-nextjs-integration-test-results.yml b/.github/workflows/upload-nextjs-integration-test-results.yml
@@ -12,6 +12,9 @@ jobs:
     name: Upload test results
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
       # Download test results into the `test-results` directory from the artifact created by `nextjs-integration-test`.
       - name: Download test results artifact
         uses: actions/download-artifact@v3
@@ -22,13 +25,13 @@ jobs:
       # Read next.js version from test results, set necessary environment variables.
       - name: Print test results
         run: |
-          ::group::Passed test paths
+          echo "::group::Passed test paths"
           cat ./test-results/passed-test-path-list.json
-          ::endgroup::
+          echo "::endgroup::"
 
-          ::group::Failed test paths
+          echo "::group::Failed test paths"
           cat ./test-results/failed-test-path-list.json
-          ::endgroup::
+          echo "::endgroup::"
 
       - name: 'Upload results to "Are We Turbo Yet" KV'
         env: