diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index bc3c7ec..18bf661 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -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 }} diff --git a/.github/workflows/docker-build-and-publish.yaml b/.github/workflows/docker-build-and-publish.yaml index e87295c..150a3cb 100644 --- a/.github/workflows/docker-build-and-publish.yaml +++ b/.github/workflows/docker-build-and-publish.yaml @@ -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 diff --git a/.github/workflows/electron-build-and-publish.yaml b/.github/workflows/electron-build-and-publish.yaml index 5d850ba..4d48a6c 100644 --- a/.github/workflows/electron-build-and-publish.yaml +++ b/.github/workflows/electron-build-and-publish.yaml @@ -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: @@ -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 }} diff --git a/webapp/package.json b/webapp/package.json index 79b976f..a7bb16e 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -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,