From a1507cb94158de2919ba2b9fe0b2be9d9892858f Mon Sep 17 00:00:00 2001 From: WardPearce Date: Mon, 6 May 2024 19:04:29 +1200 Subject: [PATCH] Moved samuel action --- .github/workflows/prod-android.yml | 2 +- .github/workflows/prod-desktop.yml | 17 ++++------------- .../electron/electron-builder.config.json | 3 +++ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/prod-android.yml b/.github/workflows/prod-android.yml index 3d17b8d4..6799597a 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: false + overwrite: true file_glob: true diff --git a/.github/workflows/prod-desktop.yml b/.github/workflows/prod-desktop.yml index ceaf5400..6f2fd0e2 100644 --- a/.github/workflows/prod-desktop.yml +++ b/.github/workflows/prod-desktop.yml @@ -56,17 +56,8 @@ jobs: - name: Sync electron package run: cd ./materialious && npx cap sync @capacitor-community/electron - - name: Install electron modules - run: cd ./materialious/electron && npm install - - - name: Build desktop packages - run: cd ./materialious/electron && npm run electron:make - - - name: Upload builds to release - uses: svenstaro/upload-release-action@v2 + - name: Build/release Electron app + uses: samuelmeuli/action-electron-builder@v1 with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./materialious/electron/dist/Materialious* - tag: ${{ github.ref }} - overwrite: false - file_glob: true + github_token: ${{ secrets.github_token }} + package_root: "./materialious/electron" diff --git a/materialious/electron/electron-builder.config.json b/materialious/electron/electron-builder.config.json index 342202a4..331c6de2 100644 --- a/materialious/electron/electron-builder.config.json +++ b/materialious/electron/electron-builder.config.json @@ -3,6 +3,9 @@ "directories": { "buildResources": "resources" }, + "publish": { + "provider": "github" + }, "icon": "../static/icon512_maskable.png", "files": [ "assets/**/*",