Skip to content

Commit 8ca61e1

Browse files
committed
seperate worflows
1 parent e018681 commit 8ca61e1

File tree

4 files changed

+89
-60
lines changed

4 files changed

+89
-60
lines changed

.github/workflows/e2e.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: E2E Tests
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
e2e:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout Repo
11+
uses: actions/checkout@v4
12+
13+
- name: Use Node.js 22
14+
uses: actions/setup-node@v4
15+
with:
16+
node-version: '22.11'
17+
18+
- run: corepack enable
19+
- run: yarn install
20+
21+
- name: yarn start:docker
22+
run: yarn start:docker
23+
24+
- name: yarn build
25+
run: yarn build
26+
27+
- name: yarn start:contract
28+
run: yarn start:contract
29+
30+
- name: Install Linux deps (Xvfb + Fluxbox)
31+
run: |
32+
sudo apt-get install --no-install-recommends -y \
33+
fluxbox \
34+
xvfb
35+
36+
- name: Run xvfb and fluxbox
37+
run: |
38+
Xvfb :0 -screen 0 1024x768x24 -listen tcp -ac &
39+
fluxbox &
40+
env:
41+
DISPLAY: :0.0
42+
43+
- name: Run e2e tests
44+
uses: cypress-io/github-action@248bde77443c376edc45906ede03a1aba9da0462
45+
with:
46+
start: npx serve ui/dist -p 5173
47+
command: yarn test:e2e
48+
wait-on: 'http://localhost:5173'
49+
wait-on-timeout: 120
50+
browser: chrome
51+
env:
52+
DISPLAY: :0.0
53+
SECRET_WORDS: 'orbit bench unit task food shock brand bracket domain regular warfare company announce wheel grape trust sphere boy doctor half guard ritual three ecology'
54+
55+
- name: Archive e2e artifacts
56+
uses: actions/upload-artifact@v4
57+
if: always()
58+
with:
59+
name: e2e-artifacts
60+
path: |
61+
ui/test/e2e/videos
62+
ui/test/e2e/screenshots
63+
continue-on-error: true

.github/workflows/pr.yml

Lines changed: 8 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,31 @@
1-
name: CI
1+
name: PR
22

33
on:
44
pull_request:
55

66
jobs:
7-
unit:
7+
test:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
1111
node-version: [18, 20, 22]
1212
steps:
1313
- name: Checkout Repo
1414
uses: actions/checkout@v4
15+
1516
- name: Use Node.js LTS versions
1617
uses: actions/setup-node@v4
1718
with:
1819
node-version: ${{ matrix.node-version }}
20+
1921
- run: corepack enable
2022
- run: yarn install
23+
2124
- name: yarn lint
2225
run: yarn lint
26+
2327
- name: yarn build
2428
run: yarn build
25-
- name: yarn test
26-
run: yarn test --exclude "**/e2e/**"
27-
integration:
28-
runs-on: ubuntu-latest
29-
steps:
30-
- name: Checkout Repo
31-
uses: actions/checkout@v4
32-
- name: Use Node.js 18
33-
uses: actions/setup-node@v4
34-
with:
35-
node-version: '18.18'
36-
- run: corepack enable
37-
- run: yarn install
38-
- name: yarn start:docker
39-
run: yarn start:docker
40-
- name: yarn build
41-
run: yarn build
42-
- name: yarn start:contract
43-
run: yarn start:contract
44-
45-
- name: Install linux deps
46-
run: |
47-
sudo apt-get install --no-install-recommends -y \
48-
fluxbox \
49-
xvfb
5029

51-
- name: Run xvfb and fluxbox
52-
run: |
53-
Xvfb :0 -screen 0 1024x768x24 -listen tcp -ac &
54-
fluxbox &
55-
env:
56-
DISPLAY: :0.0
57-
58-
- name: Run e2e tests
59-
uses: cypress-io/github-action@248bde77443c376edc45906ede03a1aba9da0462
60-
with:
61-
start: npx serve ui/dist -p 5173
62-
command: yarn test:e2e
63-
wait-on: 'http://localhost:5173'
64-
wait-on-timeout: 120
65-
browser: chrome
66-
env:
67-
DISPLAY: :0.0
68-
SECRET_WORDS: 'orbit bench unit task food shock brand bracket domain regular warfare company announce wheel grape trust sphere boy doctor half guard ritual three ecology'
69-
70-
- name: Archive e2e artifacts
71-
uses: actions/upload-artifact@v4
72-
if: always()
73-
with:
74-
name: e2e-artifacts
75-
path: |
76-
ui/test/e2e/videos
77-
ui/test/e2e/screenshots
78-
continue-on-error: true
30+
- name: yarn test (excluding e2e)
31+
run: yarn test --exclude "**/e2e/**"

ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"devDependencies": {
1919
"@agoric/notifier": "^0.7.0-u16.1",
2020
"@agoric/rpc": "0.10.0",
21-
"@agoric/store": "^0.9.3-u16.0",
21+
"@agoric/store": "^0.9.3-u20.0",
2222
"@agoric/ui-components": "^0.9.0",
2323
"@agoric/web-components": "^0.16.0",
2424
"@testing-library/react": "^14.1.2",

yarn.lock

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ __metadata:
769769
languageName: node
770770
linkType: hard
771771

772-
"@agoric/store@npm:0.9.3-upgrade-16a-dev-fb592e4.0+fb592e4, @agoric/store@npm:^0.9.3-u16.0":
772+
"@agoric/store@npm:0.9.3-upgrade-16a-dev-fb592e4.0+fb592e4":
773773
version: 0.9.3-upgrade-16a-dev-fb592e4.0
774774
resolution: "@agoric/store@npm:0.9.3-upgrade-16a-dev-fb592e4.0"
775775
dependencies:
@@ -799,6 +799,19 @@ __metadata:
799799
languageName: node
800800
linkType: hard
801801

802+
"@agoric/store@npm:^0.9.3-u20.0":
803+
version: 0.9.3-upgrade-20-dev-ef71cfd.0
804+
resolution: "@agoric/store@npm:0.9.3-upgrade-20-dev-ef71cfd.0"
805+
dependencies:
806+
"@endo/errors": "npm:^1.2.10"
807+
"@endo/exo": "npm:^1.5.9"
808+
"@endo/marshal": "npm:^1.6.4"
809+
"@endo/pass-style": "npm:^1.5.0"
810+
"@endo/patterns": "npm:^1.5.0"
811+
checksum: 10c0/495539786c95fb789efa49b353f6be8ba3d952f5f4d82bb724c7ce15b8273e471ffa977f1f381adff2530e0bcdd6d9dcd040fda352468eda8903a12093652965
812+
languageName: node
813+
linkType: hard
814+
802815
"@agoric/swing-store@npm:0.9.2-dev-3656582.0+3656582":
803816
version: 0.9.2-dev-3656582.0
804817
resolution: "@agoric/swing-store@npm:0.9.2-dev-3656582.0"
@@ -2666,7 +2679,7 @@ __metadata:
26662679
languageName: node
26672680
linkType: hard
26682681

2669-
"@endo/errors@npm:^1.2.10":
2682+
"@endo/errors@npm:^1.2.10, @endo/errors@npm:^1.2.2":
26702683
version: 1.2.10
26712684
resolution: "@endo/errors@npm:1.2.10"
26722685
dependencies:
@@ -2675,7 +2688,7 @@ __metadata:
26752688
languageName: node
26762689
linkType: hard
26772690

2678-
"@endo/errors@npm:^1.2.2, @endo/errors@npm:^1.2.5":
2691+
"@endo/errors@npm:^1.2.5":
26792692
version: 1.2.5
26802693
resolution: "@endo/errors@npm:1.2.5"
26812694
dependencies:
@@ -12987,7 +13000,7 @@ __metadata:
1298713000
dependencies:
1298813001
"@agoric/notifier": "npm:^0.7.0-u16.1"
1298913002
"@agoric/rpc": "npm:0.10.0"
12990-
"@agoric/store": "npm:^0.9.3-u16.0"
13003+
"@agoric/store": "npm:^0.9.3-u20.0"
1299113004
"@agoric/ui-components": "npm:^0.9.0"
1299213005
"@agoric/web-components": "npm:^0.16.0"
1299313006
"@testing-library/react": "npm:^14.1.2"

0 commit comments

Comments
 (0)