Skip to content

Commit bd6ab04

Browse files
timneutkenstimneutkens
authored
Upgrade Turborepo (#64767)
## What? Upgrade Turborepo to the latest version and enable the new terminal UI to dogfood: https://turbo.build/blog/turbo-1-13-0#new-terminal-ui. <!-- Thanks for opening a PR! Your contribution is much appreciated. To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below. Choose the right checklist for the change(s) that you're making: ## For Contributors ### Improving Documentation - Run `pnpm prettier-fix` to fix formatting issues before opening the PR. - Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide ### Adding or Updating Examples - The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md - Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md ### Fixing a bug - Related issues linked using `fixes #number` - Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ### Adding a feature - Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas) - Related issues/discussions are linked using `fixes #number` - e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) - Documentation added - Telemetry added. In case of a feature if it's used or not. - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ## For Maintainers - Minimal description (aim for explaining to someone not on the team to understand the PR) - When linking to a Slack thread, you might want to share details of the conclusion - Link both the Linear (Fixes NEXT-xxx) and the GitHub issues - Add review comments if necessary to explain to the reviewer the logic behind a change ### What? ### Why? ### How? Closes NEXT- Fixes # --> Closes NEXT-3164
1 parent 3587979 commit bd6ab04

12 files changed

+108
-35
lines changed

‎.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: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: test-e2e-deploy
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+
build:
12+
if: github.repository_owner == 'vercel'
13+
runs-on: ubuntu-latest
14+
15+
env:
16+
VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
17+
VERCEL_TEST_TEAM: vtest314-next-e2e-tests
18+
DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
19+
NAPI_CLI_VERSION: 2.16.2
20+
TURBO_VERSION: 1.13.2
21+
NODE_LTS_VERSION: 20
22+
CARGO_PROFILE_RELEASE_LTO: 'true'
23+
TURBO_TEAM: 'vercel'
24+
TURBO_REMOTE_ONLY: 'true'
25+
TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
26+
NEXT_TELEMETRY_DISABLED: 1
27+
28+
strategy:
29+
fail-fast: false
30+
matrix:
31+
group: [1, 2]
32+
33+
steps:
34+
- name: Setup node
35+
uses: actions/setup-node@v4
36+
with:
37+
node-version: ${{ env.NODE_LTS_VERSION }}
38+
check-latest: true
39+
- run: corepack enable
40+
41+
- uses: actions/checkout@v4
42+
with:
43+
fetch-depth: 25
44+
45+
- run: pnpm install
46+
47+
- run: pnpm run build
48+
49+
- run: npm i -g vercel@latest
50+
51+
- run: node scripts/run-e2e-test-project-reset.mjs
52+
name: Reset test project
53+
54+
- run: docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.35.1-jammy /bin/bash -c "cd /work && NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && corepack enable > /dev/null && NEXT_JUNIT_TEST_REPORT=true DATADOG_API_KEY=${DATADOG_API_KEY} DD_ENV=ci VERCEL_TEST_TOKEN=${{ secrets.VERCEL_TEST_TOKEN }} VERCEL_TEST_TEAM=vtest314-next-e2e-tests NEXT_TEST_JOB=1 NEXT_TEST_MODE=deploy TEST_TIMINGS_TOKEN=${{ secrets.TEST_TIMINGS_TOKEN }} xvfb-run node run-tests.js --type e2e --timings -g ${{ matrix.group }}/2 -c 1 >> /proc/1/fd/1"
55+
name: Run test/e2e (deploy)
56+
57+
- name: Upload test report
58+
if: always()
59+
uses: actions/upload-artifact@v4
60+
with:
61+
name: test-reports
62+
if-no-files-found: ignore
63+
retention-days: 2
64+
path: |
65+
test/test-junit-report
66+
67+
- name: Upload test report to datadog
68+
continue-on-error: true
69+
run: |
70+
ls -al ./test/*junit
71+
72+
DD_ENV=ci npx @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_related.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
2323
TURBO_REMOTE_ONLY: 'true'
2424
TURBO_TEAM: 'vercel'
25-
TURBO_VERSION: 1.12.5
25+
TURBO_VERSION: 1.13.2
2626
VERCEL_TEST_TEAM: vtest314-next-e2e-tests
2727
VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
2828

@@ -54,11 +54,11 @@ jobs:
5454
- name: Run tests
5555
run: |
5656
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 && \
57+
NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \
5858
corepack enable > /dev/null && \
5959
NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \
6060
DATADOG_API_KEY=${{ env.DATADOG_API_KEY }} \
61-
DD_ENV=${{ env.DD_ENV }} \
61+
DD_ENV=${{ env.DD_ENV }} \
6262
VERCEL_TEST_TOKEN=${{ env.VERCEL_TEST_TOKEN }} \
6363
VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \
6464
NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \

‎.github/workflows/test_e2e_deploy_scheduled.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
2727
TURBO_REMOTE_ONLY: 'true'
2828
TURBO_TEAM: 'vercel'
29-
TURBO_VERSION: 1.12.5
29+
TURBO_VERSION: 1.13.2
3030
VERCEL_TEST_TEAM: vtest314-next-e2e-tests
3131
VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
3232

@@ -60,11 +60,11 @@ jobs:
6060
- name: Run tests
6161
run: |
6262
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 && \
63+
NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \
6464
corepack enable > /dev/null && \
6565
NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \
6666
DATADOG_API_KEY=${{ env.DATADOG_API_KEY }} \
67-
DD_ENV=${{ env.DD_ENV }} \
67+
DD_ENV=${{ env.DD_ENV }} \
6868
VERCEL_TEST_TOKEN=${{ env.VERCEL_TEST_TOKEN }} \
6969
VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \
7070
NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \

‎.github/workflows/trigger_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ name: Trigger Release
2929

3030
env:
3131
NAPI_CLI_VERSION: 2.14.7
32-
TURBO_VERSION: 1.12.5
32+
TURBO_VERSION: 1.13.2
3333
NODE_LTS_VERSION: 20
3434

3535
jobs:

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
"taskr": "1.1.0",
234234
"tree-kill": "1.2.2",
235235
"tsec": "0.2.1",
236-
"turbo": "1.12.5",
236+
"turbo": "1.13.2",
237237
"typescript": "5.3.3",
238238
"unfetch": "4.2.0",
239239
"wait-port": "0.2.2",

0 commit comments

Comments
 (0)