Skip to content

Commit

Permalink
ci にまとめる
Browse files Browse the repository at this point in the history
  • Loading branch information
voluntas committed Sep 8, 2024
1 parent ef8f29f commit 09c808e
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 31 deletions.
17 changes: 15 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:
cancel-in-progress: true

jobs:
ci:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -21,4 +21,17 @@ jobs:
node-version: 22
- run: pnpm --version
- run: pnpm install
- run: pnpm run build
- run: pnpm run build
test-playwright:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 22
- run: pnpm --version
- run: pnpm install
- run: pnpm exec playwright install chromium --with-deps
- run: pnpm test:playwright
25 changes: 0 additions & 25 deletions .github/workflows/e2e.yml

This file was deleted.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"private": true,
"scripts": {
"dev": "vite",
"e2e-test": "playwright test",
"test:vitest": "vitest run",
"test:playwright": "playwright tests",
"build": "vite build",
"lint": "biome lint src/",
"fmt": "pnpm biome format --write src/ test/",
"test": "vitest run",
"fmt": "pnpm biome format --write src/ tests/",
"check": "tsc --noEmit"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion playwright.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { defineConfig, devices } from '@playwright/test'
// pnpm exec playwright test --ui

export default defineConfig({
testDir: 'tests',
testDir: 'tests/playwright',
// fullyParallel: true,
reporter: 'html',
projects: [
Expand Down
File renamed without changes.
7 changes: 7 additions & 0 deletions vitest.config.mts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { defineConfig } from 'vitest/config'

export default defineConfig({
test: {
dir: 'tests/vitest',
},
})

0 comments on commit 09c808e

Please sign in to comment.