Skip to content

Commit 99e389c

Browse files
committed
chore: Fix release build
1 parent 1978b91 commit 99e389c

File tree

3 files changed

+9
-21
lines changed

3 files changed

+9
-21
lines changed

.github/workflows/release.yml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
name: Release
22

33
on:
4-
push:
5-
branches:
6-
- 'main'
4+
workflow_run:
5+
workflows: [ "Test" ]
6+
branches: [ "main"]
7+
types:
8+
- completed
79

810
jobs:
911
main:
12+
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1013
runs-on: ubuntu-latest
1114
steps:
1215
- uses: actions/checkout@v3
@@ -47,19 +50,6 @@ jobs:
4750
- name: Build all packages
4851
run: pnpm build || pnpm build
4952

50-
- name: Test
51-
run: pnpm test
52-
53-
- name: Build for cypress
54-
run: pnpm build:e2e
55-
56-
- name: Cypress
57-
run: pnpm --prefix=e2e run start
58-
59-
- name: Cypress cleanup
60-
if: always()
61-
run: pnpm --prefix=e2e run services:stop
62-
6353
- name: Recreate release with push
6454
run: |
6555
git stash

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Test
22

33
on:
44
pull_request:
5+
push:
6+
branches: [ main ]
57

68
jobs:
79
test:

e2e/package.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@
44
"private": true,
55
"description": "e2e tests for tolgee server & webapp",
66
"scripts": {
7-
"start": "npm run services:start && npm run download-extension && npm run services:wait-for-start && npm run cy:run",
87
"cy:run": "cypress run",
98
"cy:open": "cypress open --browser chrome",
109
"cy:folders-json": "node scripts/listTests.js",
11-
"download-extension": "sh scripts/downloadTolgeeExtension.sh",
12-
"services:start": "sh scripts/startServices.sh",
13-
"services:wait-for-start": "node scripts/waitForServices.js",
14-
"services:stop": "docker compose stop; docker compose rm -f -v"
10+
"download-extension": "sh scripts/downloadTolgeeExtension.sh"
1511
},
1612
"author": "Jan Cizmar",
1713
"license": "BSD",

0 commit comments

Comments
 (0)