Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
fynnfluegge committed Nov 17, 2024
1 parent 68bb340 commit 81a3e41
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: Release Build

on:
push:
tags:
- "*.*.*"
# push:
# tags:
# - "*.*.*"
pull_request:
branches: [main]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker-build-and-publish.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Docker Build and Push

on:
pull_request:
branches: [main]
# workflow_run:
# workflows: ["Release Build"]
# types: [completed]
# pull_request:
# branches: [main]
workflow_run:
workflows: ["Release Build"]
types: [completed]

env:
REGISTRY_IMAGE_API: fynnfluegge/rocketnotes-api
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/electron-build-and-publish.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Electron Build and Publish

on:
pull_request:
branches: [main]
# workflow_run:
# workflows: ["Release Build"]
# types: [completed]
# pull_request:
# branches: [main]
workflow_run:
workflows: ["Release Build"]
types: [completed]

jobs:
build:
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Bundle and Publish electron
run: |
cd webapp
npm run bundle-electron --publish always
npm run bundle-electron
env:
AWS_ACCOUNT: ${{ secrets.AWS_ACCOUNT }}
AWS_REGION: ${{ vars.AWS_REGION }}
2 changes: 1 addition & 1 deletion webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"build": "npm run config-prod && ng build --configuration production",
"build-local": "export API_URL='http://localhost:3002' && npm run config-dev && ng build",
"build-electron": "npm run config-prod && ng build --configuration production --base-href ./",
"bundle-electron": "./node_modules/.bin/electron-builder",
"bundle-electron": "./node_modules/.bin/electron-builder --publish always",
"test": "ng test"
},
"private": true,
Expand Down

0 comments on commit 81a3e41

Please sign in to comment.