Skip to content

Commit f4f69ab

Browse files
Luca Forstnerbillyvg
authored andcommitted
ci(canary-tests): Fix Next.js canary test issues (#12326)
1 parent fe94026 commit f4f69ab

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/canary.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
name: E2E ${{ matrix.label }} Test
5555
needs: [job_e2e_prepare]
5656
runs-on: ubuntu-20.04
57-
timeout-minutes: 15
57+
timeout-minutes: 20
5858
env:
5959
E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
6060
E2E_TEST_DSN: ${{ secrets.E2E_TEST_DSN }}
@@ -138,7 +138,7 @@ jobs:
138138

139139
- name: Run E2E test
140140
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
141-
timeout-minutes: 5
141+
timeout-minutes: 15
142142
run: yarn test:assert
143143

144144
- name: Create Issue

dev-packages/e2e-tests/test-applications/nextjs-15/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"test:prod": "TEST_ENV=production playwright test",
99
"test:dev": "TEST_ENV=development playwright test",
1010
"test:build": "pnpm install && npx playwright install && pnpm build",
11-
"test:build-canary": "pnpm install && pnpm add next@canary && pnpm add react@beta && pnpm add react-dom@beta && npx playwright install && pnpm build",
12-
"test:build-latest": "pnpm install && pnpm add next@latest && npx playwright install && pnpm build",
11+
"test:build-canary": "pnpm install && pnpm add next@rc && pnpm add react@beta && pnpm add react-dom@beta && npx playwright install && pnpm build",
12+
"test:build-latest": "pnpm install && pnpm add next@rc && pnpm add react@beta && pnpm add react-dom@beta && npx playwright install && pnpm build",
1313
"test:assert": "pnpm test:prod && pnpm test:dev"
1414
},
1515
"dependencies": {

dev-packages/e2e-tests/test-applications/nextjs-app-dir/assert-build.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const buildStdout = fs.readFileSync('.tmp_build_stdout', 'utf-8');
88
const buildStderr = fs.readFileSync('.tmp_build_stderr', 'utf-8');
99

1010
// Assert that there was no funky build time warning when we are on a stable (pinned) version
11-
if (nextjsVersion !== 'latest' && nextjsVersion !== 'canary') {
11+
if (nextjsVersion !== 'latest' && !nextjsVersion.includes('-canary') && !nextjsVersion.includes('-rc')) {
1212
assert.doesNotMatch(buildStderr, /Import trace for requested module/); // This is Next.js/Webpack speech for "something is off"
1313
}
1414

0 commit comments

Comments
 (0)