Skip to content

Commit 98bde0d

Browse files
Merge pull request #17 from jitsucom/vklimontovich/fix-ci-run
fix: separate e2e workflow, restore test-app tsconfig
2 parents 2121e90 + d517f03 commit 98bde0d

File tree

4 files changed

+73
-5
lines changed

4 files changed

+73
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,4 @@ jobs:
3131
run: bun run test
3232

3333
- name: Build
34-
run: bun run build #required for e2e
35-
36-
- name: E2E Tests
37-
run: bun run e2e
34+
run: bun run build

.github/workflows/e2e.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: E2E
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
8+
9+
concurrency:
10+
group: e2e-${{ github.event.pull_request.number || github.sha }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
e2e:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
19+
- uses: oven-sh/setup-bun@v2
20+
with:
21+
bun-version: latest
22+
23+
- name: Install dependencies
24+
run: bun install --frozen-lockfile
25+
26+
- name: Cache Playwright browsers
27+
uses: actions/cache@v4
28+
with:
29+
path: ~/.cache/ms-playwright
30+
key: playwright-${{ hashFiles('e2e/bun.lock') }}
31+
32+
- name: Install Playwright browsers
33+
run: ./e2e/node_modules/.bin/playwright install --with-deps chromium
34+
35+
- name: Build
36+
run: bun run build
37+
38+
- name: E2E Tests
39+
run: bun run e2e

e2e/test-app/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ node_modules/
44
.env.local
55
package.json
66
package-lock.json
7-
tsconfig.json
87
next-env.d.ts

e2e/test-app/tsconfig.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"compilerOptions": {
3+
"target": "ES2017",
4+
"lib": ["dom", "dom.iterable", "esnext"],
5+
"allowJs": true,
6+
"skipLibCheck": true,
7+
"strict": true,
8+
"noEmit": true,
9+
"esModuleInterop": true,
10+
"module": "esnext",
11+
"moduleResolution": "bundler",
12+
"resolveJsonModule": true,
13+
"isolatedModules": true,
14+
"jsx": "react-jsx",
15+
"incremental": true,
16+
"plugins": [
17+
{
18+
"name": "next"
19+
}
20+
],
21+
"paths": {
22+
"@/*": ["./src/*"]
23+
}
24+
},
25+
"include": [
26+
"next-env.d.ts",
27+
"**/*.ts",
28+
"**/*.tsx",
29+
".next/types/**/*.ts",
30+
".next/dev/types/**/*.ts"
31+
],
32+
"exclude": ["node_modules"]
33+
}

0 commit comments

Comments
 (0)