From fbd723edb7f9aad2eeb30e175fdfabbaab118045 Mon Sep 17 00:00:00 2001 From: fynnfluegge Date: Mon, 18 Nov 2024 21:54:58 +0100 Subject: [PATCH] fix electron build --- .github/workflows/docker-build-and-publish.yaml | 2 +- .github/workflows/electron-build-and-publish.yaml | 8 +++++--- webapp/package.json | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-build-and-publish.yaml b/.github/workflows/docker-build-and-publish.yaml index 3aa6448..2c497f7 100644 --- a/.github/workflows/docker-build-and-publish.yaml +++ b/.github/workflows/docker-build-and-publish.yaml @@ -58,7 +58,7 @@ jobs: - name: Extract release tag id: get_tag - run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + run: echo "RELEASE_TAG=$GITHUB_REF_NAME" >> $GITHUB_ENV - name: Build and push Docker image api uses: docker/build-push-action@v5 diff --git a/.github/workflows/electron-build-and-publish.yaml b/.github/workflows/electron-build-and-publish.yaml index 6c4005a..4cd6f17 100644 --- a/.github/workflows/electron-build-and-publish.yaml +++ b/.github/workflows/electron-build-and-publish.yaml @@ -1,9 +1,11 @@ name: Electron Build and Publish on: - workflow_run: - workflows: ["Release Build"] - types: [completed] + pull_request: + branches: [main] + # workflow_run: + # workflows: ["Release Build"] + # types: [completed] jobs: build: diff --git a/webapp/package.json b/webapp/package.json index a7bb16e..eaa7732 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 --publish always", + "bundle-electron": "./node_modules/.bin/electron-builder --publish always --mac --arm64", "test": "ng test" }, "private": true,