Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: reduce windows coverage #8632

Merged
merged 6 commits into from
Jan 20, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ jobs:
- node-version: 16
os: ubuntu-latest
e2e-browser: 'chromium'
- node-version: 16
os: windows-latest
e2e-browser: 'chromium'
- node-version: 18
os: ubuntu-latest
e2e-browser: 'chromium'
Expand Down Expand Up @@ -81,7 +78,7 @@ jobs:
matrix:
include:
- node-version: 16
os: ubuntu-latest
os: windows-2019
Rich-Harris marked this conversation as resolved.
Show resolved Hide resolved
e2e-browser: 'firefox'
- node-version: 16
os: macOS-latest
Expand All @@ -99,15 +96,15 @@ jobs:
cache: pnpm
- run: pnpm install --frozen-lockfile
- run: pnpm playwright install ${{ matrix.e2e-browser }}
- run: pnpm test:cross-browser
- run: pnpm test:cross-platform
- name: Archive test results
if: failure()
shell: bash
run: find packages -type d -name test-results -not -empty | tar -czf test-results-cross-browser.tar.gz --files-from=-
run: find packages -type d -name test-results -not -empty | tar -czf test-results-cross-platform.tar.gz --files-from=-
- name: Upload test results
if: failure()
uses: actions/upload-artifact@v3
with:
retention-days: 3
name: test-failure-cross-browser-${{ github.run_id }}-${{ matrix.os }}-${{ matrix.node-version }}-${{ matrix.e2e-browser }}
path: test-results-cross-browser.tar.gz
name: test-failure-cross-platform-${{ github.run_id }}-${{ matrix.os }}-${{ matrix.node-version }}-${{ matrix.e2e-browser }}
path: test-results-cross-platform.tar.gz
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"scripts": {
"test": "turbo run test --filter=./packages/*",
"test:cross-browser": "turbo run test:cross-browser --filter=./packages/*",
"test:cross-platform": "turbo run test:cross-platform --filter=./packages/*",
"test:vite-ecosystem-ci": "pnpm test --dir packages/kit",
"check": "turbo run check",
"lint": "turbo run lint",
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"format": "pnpm lint --write",
"test": "pnpm test:unit && pnpm test:integration",
"test:integration": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test",
"test:cross-browser": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-browser",
"test:cross-platform": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-platform",
"test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\"",
"postinstall": "node postinstall.js"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/kit/test/apps/basics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"test": "node test/setup.js && pnpm test:dev && pnpm test:build",
"test:dev": "rimraf test/errors.json && cross-env DEV=true playwright test",
"test:build": "rimraf test/errors.json && playwright test",
"test:cross-browser": "npm run test:cross-browser:dev && npm run test:cross-browser:build",
"test:cross-browser:dev": "node test/setup.js && rimraf test/errors.json && cross-env DEV=true playwright test test/cross-browser/",
"test:cross-browser:build": "node test/setup.js && rimraf test/errors.json && playwright test test/cross-browser/"
"test:cross-platform": "npm run test:cross-platform:dev && npm run test:cross-platform:build",
"test:cross-platform:dev": "node test/setup.js && rimraf test/errors.json && cross-env DEV=true playwright test test/cross-platform/",
"test:cross-platform:build": "node test/setup.js && rimraf test/errors.json && playwright test test/cross-platform/"
},
"devDependencies": {
"@sveltejs/kit": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/test/apps/basics/test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ test.describe('Actions', () => {
test.describe.serial('Cookies API', () => {
// there's a problem running these tests in the CI with webkit,
// since AFAICT the browser is using http://localhost and webkit won't
// set a `Secure` cookie on that. So we don't run these cross-browser
// set a `Secure` cookie on that. So we don't run these cross-platform

test('sanity check for cookies', async ({ page }) => {
await page.goto('/cookies');
Expand Down
3 changes: 2 additions & 1 deletion packages/kit/test/build-errors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"private": true,
"version": "0.0.0-next.0",
"scripts": {
"test": "uvu . \"(spec\\.js|test[\\\\/]index\\.js)\""
"test": "uvu . \"(spec\\.js|test[\\\\/]index\\.js)\"",
"test:cross-platform": "uvu . \"(spec\\.js|test[\\\\/]index\\.js)\""
},
"type": "module",
"devDependencies": {
Expand Down
3 changes: 2 additions & 1 deletion packages/kit/test/prerendering/basics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"build": "vite build",
"preview": "vite preview",
"check": "svelte-kit sync && tsc && svelte-check",
"test": "svelte-kit sync && pnpm build && uvu test"
"test": "svelte-kit sync && pnpm build && uvu test",
"test:cross-platform": "pnpm test"
},
"devDependencies": {
"@sveltejs/kit": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"outputMode": "new-only",
"env": ["CI", "TURBO_CACHE_KEY"]
},
"test:cross-browser": {
"test:cross-platform": {
"inputs": ["src/**", "scripts/**", "shared/**", "templates/**", "test/**"],
"outputs": ["coverage/", "test-results/**"],
"outputMode": "new-only",
Expand Down