Skip to content

Commit 4694742

Browse files
ijjkijjk
authored
Merge branch 'canary' into fix/delete-traceparent-from-cachekey-also-deletes-traceparent-from-request
2 parents 16f10ca + ea0f516 commit 4694742

File tree

75 files changed

+750
-246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+750
-246
lines changed

‎.github/ISSUE_TEMPLATE/2.example_bug_report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug Report for Examples
22
description: Create a bug report for one of the Next.js examples
3-
labels: ['example bug']
3+
labels: ['examples']
44
body:
55
- type: markdown
66
attributes:

‎.github/workflows/build_and_deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
env:
99
NAPI_CLI_VERSION: 2.16.2
10-
TURBO_VERSION: 1.12.5
10+
TURBO_VERSION: 1.13.2
1111
NODE_LTS_VERSION: 20
1212
CARGO_PROFILE_RELEASE_LTO: 'true'
1313
TURBO_TEAM: 'vercel'

‎.github/workflows/build_and_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
NAPI_CLI_VERSION: 2.14.7
11-
TURBO_VERSION: 1.12.5
11+
TURBO_VERSION: 1.13.2
1212
NODE_MAINTENANCE_VERSION: 18
1313
NODE_LTS_VERSION: 20
1414
TEST_CONCURRENCY: 8

‎.github/workflows/build_reusable.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ on:
5252

5353
env:
5454
NAPI_CLI_VERSION: 2.14.7
55-
TURBO_VERSION: 1.12.5
55+
TURBO_VERSION: 1.13.2
5656
NODE_LTS_VERSION: 20.9.0
5757
TEST_CONCURRENCY: 8
5858
# disable backtrace for test snapshots

‎.github/workflows/code_freeze.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ name: Code Freeze
1717

1818
env:
1919
NAPI_CLI_VERSION: 2.14.7
20-
TURBO_VERSION: 1.12.5
20+
TURBO_VERSION: 1.13.2
2121
NODE_LTS_VERSION: 20
2222

2323
jobs:

‎.github/workflows/pull_request_stats.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Generate Pull Request Stats
66

77
env:
88
NAPI_CLI_VERSION: 2.14.7
9-
TURBO_VERSION: 1.12.5
9+
TURBO_VERSION: 1.13.2
1010
NODE_LTS_VERSION: 20
1111
TEST_CONCURRENCY: 6
1212

‎.github/workflows/test_e2e_deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
VERCEL_TEST_TEAM: vtest314-next-e2e-tests
1818
DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
1919
NAPI_CLI_VERSION: 2.16.2
20-
TURBO_VERSION: 1.12.5
20+
TURBO_VERSION: 1.13.2
2121
NODE_LTS_VERSION: 20
2222
CARGO_PROFILE_RELEASE_LTO: 'true'
2323
TURBO_TEAM: 'vercel'

‎.github/workflows/test_e2e_deploy_related.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: Test E2E (Vercel Deploy), related
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize]
6+
7+
jobs:
8+
test:
9+
if: github.repository_owner == 'vercel'
10+
runs-on: ubuntu-latest
11+
12+
env:
13+
CARGO_PROFILE_RELEASE_LTO: 'true'
14+
DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
15+
DD_ENV: 'ci'
16+
NAPI_CLI_VERSION: 2.16.2
17+
NEXT_JUNIT_TEST_REPORT: 'true'
18+
NEXT_TELEMETRY_DISABLED: 1
19+
NEXT_TEST_JOB: 1
20+
NEXT_TEST_MODE: 'deploy'
21+
NODE_LTS_VERSION: 20
22+
TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
23+
TURBO_REMOTE_ONLY: 'true'
24+
TURBO_TEAM: 'vercel'
25+
TURBO_VERSION: 1.13.2
26+
VERCEL_TEST_TEAM: vtest314-next-e2e-tests
27+
VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
28+
29+
strategy:
30+
fail-fast: false
31+
32+
steps:
33+
- name: Setup Node.js
34+
uses: actions/setup-node@v4
35+
with:
36+
node-version: ${{ env.NODE_LTS_VERSION }}
37+
check-latest: true
38+
39+
- name: Setup pnpm
40+
run: corepack enable
41+
42+
- name: Checkout
43+
uses: actions/checkout@v4
44+
with:
45+
fetch-depth: 25
46+
47+
- name: Setup tests
48+
run: |
49+
pnpm install
50+
pnpm run build
51+
npm i -g vercel@latest
52+
node scripts/run-e2e-test-project-reset.mjs
53+
54+
- name: Run tests
55+
run: |
56+
docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.41.2-jammy /bin/bash -c "cd /work && \
57+
NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \
58+
corepack enable > /dev/null && \
59+
NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \
60+
DATADOG_API_KEY=${{ env.DATADOG_API_KEY }} \
61+
DD_ENV=${{ env.DD_ENV }} \
62+
VERCEL_TEST_TOKEN=${{ env.VERCEL_TEST_TOKEN }} \
63+
VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \
64+
NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \
65+
NEXT_TEST_MODE=${{ env.NEXT_TEST_MODE }} \
66+
TEST_TIMINGS_TOKEN=${{ env.TEST_TIMINGS_TOKEN }} \
67+
xvfb-run node run-tests.js --related --timings -c 1 >> /proc/1/fd/1"
68+
69+
- name: Save test report as artifacts
70+
if: always()
71+
uses: actions/upload-artifact@v4
72+
with:
73+
name: test-reports
74+
if-no-files-found: ignore
75+
retention-days: 2
76+
path: test/test-junit-report
77+
78+
- name: Upload test report to Datadog
79+
continue-on-error: true
80+
run: |
81+
pnpx @datadog/datadog-ci@2.23.1 junit upload --tags test.type:nextjs_deploy_e2e --service nextjs ./test/test-junit-report

‎.github/workflows/test_e2e_deploy_scheduled.yml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
name: Test E2E (Vercel Deploy), scheduled
2+
3+
on:
4+
schedule:
5+
# run every day at midnight
6+
- cron: '0 0 * * *'
7+
# allow triggering manually as well
8+
workflow_dispatch:
9+
10+
jobs:
11+
test:
12+
if: github.repository_owner == 'vercel'
13+
runs-on: ubuntu-latest
14+
15+
env:
16+
CARGO_PROFILE_RELEASE_LTO: 'true'
17+
DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
18+
DD_ENV: 'ci'
19+
NAPI_CLI_VERSION: 2.16.2
20+
NEXT_JUNIT_TEST_REPORT: 'true'
21+
NEXT_TELEMETRY_DISABLED: 1
22+
NEXT_TEST_CONTINUE_ON_ERROR: 1
23+
NEXT_TEST_JOB: 1
24+
NEXT_TEST_MODE: 'deploy'
25+
NODE_LTS_VERSION: 20
26+
TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
27+
TURBO_REMOTE_ONLY: 'true'
28+
TURBO_TEAM: 'vercel'
29+
TURBO_VERSION: 1.13.2
30+
VERCEL_TEST_TEAM: vtest314-next-e2e-tests
31+
VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
32+
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
group: [1, 2]
37+
38+
steps:
39+
- name: Setup Node.js
40+
uses: actions/setup-node@v4
41+
with:
42+
node-version: ${{ env.NODE_LTS_VERSION }}
43+
check-latest: true
44+
45+
- name: Setup pnpm
46+
run: corepack enable
47+
48+
- name: Checkout
49+
uses: actions/checkout@v4
50+
with:
51+
fetch-depth: 25
52+
53+
- name: Setup tests
54+
run: |
55+
pnpm install
56+
pnpm run build
57+
npm i -g vercel@latest
58+
node scripts/run-e2e-test-project-reset.mjs
59+
60+
- name: Run tests
61+
run: |
62+
docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.41.2-jammy /bin/bash -c "cd /work && \
63+
NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \
64+
corepack enable > /dev/null && \
65+
NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \
66+
DATADOG_API_KEY=${{ env.DATADOG_API_KEY }} \
67+
DD_ENV=${{ env.DD_ENV }} \
68+
VERCEL_TEST_TOKEN=${{ env.VERCEL_TEST_TOKEN }} \
69+
VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \
70+
NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \
71+
NEXT_TEST_MODE=${{ env.NEXT_TEST_MODE }} \
72+
TEST_TIMINGS_TOKEN=${{ env.TEST_TIMINGS_TOKEN }} \
73+
xvfb-run node run-tests.js --type e2e --timings -g ${{ matrix.group }}/2 -c 1 >> /proc/1/fd/1"
74+
75+
- name: Save test report as artifacts
76+
if: always()
77+
uses: actions/upload-artifact@v4
78+
with:
79+
name: test-reports
80+
if-no-files-found: ignore
81+
retention-days: 2
82+
path: test/test-junit-report
83+
84+
- name: Upload test report to Datadog
85+
continue-on-error: true
86+
run: |
87+
pnpx @datadog/datadog-ci@2.23.1 junit upload --tags test.type:nextjs_deploy_e2e --service nextjs ./test/test-junit-report

‎.github/workflows/triage.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ jobs:
1717
name: Nissuer
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: balazsorban44/nissuer@1.9.3
20+
- uses: balazsorban44/nissuer@1.10.0
2121
with:
2222
label-area-prefix: ''
23+
label-area-match: 'name'
2324
label-area-section: 'Which area\(s\) are affected\? \(Select all that apply\)(.*)### Additional context'
2425
label-comments: |
2526
{

0 commit comments

Comments
 (0)