From d859c208050e6d7b8c5d3f6b863d499803163b67 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Mon, 6 May 2024 18:54:57 +1200 Subject: [PATCH] Updated build --- .github/workflows/prod-android.yml | 2 +- .github/workflows/prod-desktop.yml | 19 ++++++++++--------- .../electron/electron-builder.config.json | 3 --- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/prod-android.yml b/.github/workflows/prod-android.yml index 6799597a..3d17b8d4 100644 --- a/.github/workflows/prod-android.yml +++ b/.github/workflows/prod-android.yml @@ -78,5 +78,5 @@ jobs: body: ${{ steps.changelog.outputs.changelog }} file: ./materialious/android/app/release/* tag: ${{ github.ref }} - overwrite: true + overwrite: false file_glob: true diff --git a/.github/workflows/prod-desktop.yml b/.github/workflows/prod-desktop.yml index 46886687..ceaf5400 100644 --- a/.github/workflows/prod-desktop.yml +++ b/.github/workflows/prod-desktop.yml @@ -60,12 +60,13 @@ jobs: run: cd ./materialious/electron && npm install - name: Build desktop packages - run: | - cd ./materialious/electron - if [[ "$RUNNER_OS" == "Windows" ]]; then - $env:GH_TOKEN = "${{ secrets.GITHUB_TOKEN }}" - npm run electron:make - else - export GH_TOKEN=${{ secrets.GITHUB_TOKEN }} - npm run electron:make - fi \ No newline at end of file + run: cd ./materialious/electron && npm run electron:make + + - name: Upload builds to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ./materialious/electron/dist/Materialious* + tag: ${{ github.ref }} + overwrite: false + file_glob: true diff --git a/materialious/electron/electron-builder.config.json b/materialious/electron/electron-builder.config.json index 553615a5..342202a4 100644 --- a/materialious/electron/electron-builder.config.json +++ b/materialious/electron/electron-builder.config.json @@ -10,9 +10,6 @@ "capacitor.config.*", "app/**/*" ], - "publish": { - "provider": "github" - }, "nsis": { "allowElevation": true, "oneClick": false,