Skip to content

Commit

Permalink
chore: Fix release build
Browse files Browse the repository at this point in the history
  • Loading branch information
JanCizmar committed Jan 11, 2023
1 parent 1978b91 commit 99e389c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 21 deletions.
22 changes: 6 additions & 16 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
name: Release

on:
push:
branches:
- 'main'
workflow_run:
workflows: [ "Test" ]
branches: [ "main"]
types:
- completed

jobs:
main:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -47,19 +50,6 @@ jobs:
- name: Build all packages
run: pnpm build || pnpm build

- name: Test
run: pnpm test

- name: Build for cypress
run: pnpm build:e2e

- name: Cypress
run: pnpm --prefix=e2e run start

- name: Cypress cleanup
if: always()
run: pnpm --prefix=e2e run services:stop

- name: Recreate release with push
run: |
git stash
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Test

on:
pull_request:
push:
branches: [ main ]

jobs:
test:
Expand Down
6 changes: 1 addition & 5 deletions e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@
"private": true,
"description": "e2e tests for tolgee server & webapp",
"scripts": {
"start": "npm run services:start && npm run download-extension && npm run services:wait-for-start && npm run cy:run",
"cy:run": "cypress run",
"cy:open": "cypress open --browser chrome",
"cy:folders-json": "node scripts/listTests.js",
"download-extension": "sh scripts/downloadTolgeeExtension.sh",
"services:start": "sh scripts/startServices.sh",
"services:wait-for-start": "node scripts/waitForServices.js",
"services:stop": "docker compose stop; docker compose rm -f -v"
"download-extension": "sh scripts/downloadTolgeeExtension.sh"
},
"author": "Jan Cizmar",
"license": "BSD",
Expand Down

0 comments on commit 99e389c

Please sign in to comment.