Skip to content

Commit 357e70b

Browse files
chore: reduce windows coverage (#8632)
* reduce windows coverage * test build errors * cross-browser -> cross-platform * oops * Update .github/workflows/ci.yml Co-authored-by: Ben McCann <[email protected]> Co-authored-by: Ben McCann <[email protected]>
1 parent 2c78eee commit 357e70b

File tree

10 files changed

+16
-17
lines changed

10 files changed

+16
-17
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ jobs:
4242
- node-version: 16
4343
os: ubuntu-latest
4444
e2e-browser: 'chromium'
45-
- node-version: 16
46-
os: windows-latest
47-
e2e-browser: 'chromium'
4845
- node-version: 18
4946
os: ubuntu-latest
5047
e2e-browser: 'chromium'
@@ -81,7 +78,7 @@ jobs:
8178
matrix:
8279
include:
8380
- node-version: 16
84-
os: ubuntu-latest
81+
os: windows-2019 # slowness reported on newer versions https://github.com/actions/runner-images/issues/5166
8582
e2e-browser: 'firefox'
8683
- node-version: 16
8784
os: macOS-latest
@@ -99,15 +96,15 @@ jobs:
9996
cache: pnpm
10097
- run: pnpm install --frozen-lockfile
10198
- run: pnpm playwright install ${{ matrix.e2e-browser }}
102-
- run: pnpm test:cross-browser
99+
- run: pnpm test:cross-platform
103100
- name: Archive test results
104101
if: failure()
105102
shell: bash
106-
run: find packages -type d -name test-results -not -empty | tar -czf test-results-cross-browser.tar.gz --files-from=-
103+
run: find packages -type d -name test-results -not -empty | tar -czf test-results-cross-platform.tar.gz --files-from=-
107104
- name: Upload test results
108105
if: failure()
109106
uses: actions/upload-artifact@v3
110107
with:
111108
retention-days: 3
112-
name: test-failure-cross-browser-${{ github.run_id }}-${{ matrix.os }}-${{ matrix.node-version }}-${{ matrix.e2e-browser }}
113-
path: test-results-cross-browser.tar.gz
109+
name: test-failure-cross-platform-${{ github.run_id }}-${{ matrix.os }}-${{ matrix.node-version }}-${{ matrix.e2e-browser }}
110+
path: test-results-cross-platform.tar.gz

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"scripts": {
77
"test": "turbo run test --filter=./packages/*",
8-
"test:cross-browser": "turbo run test:cross-browser --filter=./packages/*",
8+
"test:cross-platform": "turbo run test:cross-platform --filter=./packages/*",
99
"test:vite-ecosystem-ci": "pnpm test --dir packages/kit",
1010
"check": "turbo run check",
1111
"lint": "turbo run lint",

packages/kit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"format": "pnpm lint --write",
6464
"test": "pnpm test:unit && pnpm test:integration",
6565
"test:integration": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test",
66-
"test:cross-browser": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-browser",
66+
"test:cross-platform": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-platform",
6767
"test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\"",
6868
"postinstall": "node postinstall.js"
6969
},

packages/kit/test/apps/basics/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"test": "node test/setup.js && pnpm test:dev && pnpm test:build",
1111
"test:dev": "rimraf test/errors.json && cross-env DEV=true playwright test",
1212
"test:build": "rimraf test/errors.json && playwright test",
13-
"test:cross-browser": "npm run test:cross-browser:dev && npm run test:cross-browser:build",
14-
"test:cross-browser:dev": "node test/setup.js && rimraf test/errors.json && cross-env DEV=true playwright test test/cross-browser/",
15-
"test:cross-browser:build": "node test/setup.js && rimraf test/errors.json && playwright test test/cross-browser/"
13+
"test:cross-platform": "npm run test:cross-platform:dev && npm run test:cross-platform:build",
14+
"test:cross-platform:dev": "node test/setup.js && rimraf test/errors.json && cross-env DEV=true playwright test test/cross-platform/",
15+
"test:cross-platform:build": "node test/setup.js && rimraf test/errors.json && playwright test test/cross-platform/"
1616
},
1717
"devDependencies": {
1818
"@sveltejs/kit": "workspace:^",

packages/kit/test/apps/basics/test/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ test.describe('Actions', () => {
10161016
test.describe.serial('Cookies API', () => {
10171017
// there's a problem running these tests in the CI with webkit,
10181018
// since AFAICT the browser is using http://localhost and webkit won't
1019-
// set a `Secure` cookie on that. So we don't run these cross-browser
1019+
// set a `Secure` cookie on that. So we don't run these cross-platform
10201020

10211021
test('sanity check for cookies', async ({ page }) => {
10221022
await page.goto('/cookies');

packages/kit/test/build-errors/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"private": true,
44
"version": "0.0.0-next.0",
55
"scripts": {
6-
"test": "uvu . \"(spec\\.js|test[\\\\/]index\\.js)\""
6+
"test": "uvu . \"(spec\\.js|test[\\\\/]index\\.js)\"",
7+
"test:cross-platform": "uvu . \"(spec\\.js|test[\\\\/]index\\.js)\""
78
},
89
"type": "module",
910
"devDependencies": {

packages/kit/test/prerendering/basics/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"build": "vite build",
88
"preview": "vite preview",
99
"check": "svelte-kit sync && tsc && svelte-check",
10-
"test": "svelte-kit sync && pnpm build && uvu test"
10+
"test": "svelte-kit sync && pnpm build && uvu test",
11+
"test:cross-platform": "pnpm test"
1112
},
1213
"devDependencies": {
1314
"@sveltejs/kit": "workspace:^",

turbo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"outputMode": "new-only",
5050
"env": ["CI", "TURBO_CACHE_KEY"]
5151
},
52-
"test:cross-browser": {
52+
"test:cross-platform": {
5353
"inputs": ["src/**", "scripts/**", "shared/**", "templates/**", "test/**"],
5454
"outputs": ["coverage/", "test-results/**"],
5555
"outputMode": "new-only",

0 commit comments

Comments
 (0)