From 63eb58fbf160e26256d1cbceb27b060de22dc670 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Sat, 30 Nov 2024 14:44:21 +1300
Subject: [PATCH 1/2] Fix github publish

---
 .github/workflows/prod-android.yml            |  8 ++++----
 .../electron/electron-builder.config.json     | 20 +++++++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/prod-android.yml b/.github/workflows/prod-android.yml
index 3377ee62..5b0986cd 100644
--- a/.github/workflows/prod-android.yml
+++ b/.github/workflows/prod-android.yml
@@ -67,8 +67,8 @@ jobs:
         
       - name: Move files to release
         run: |
-          mv app/build/outputs/*.aab app/release/
-          mv app/build/outputs/*.apk app/release/
+          mv app/build/outputs/*signed.aab app/release/
+          mv app/build/outputs/*signed.apk app/release/
 
       - name: Delete temp apks
         run: rm app/release/*temp*
@@ -87,8 +87,8 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ./materialious/android/app/release/*
-          tag: v${{ steps.package-version.outputs.current-version }}
+          tag: ${{ steps.package-version.outputs.current-version }}
           release_name: ${{ steps.package-version.outputs.current-version }}
           overwrite: true
           file_glob: true
-          draft: true
+          draft: false
diff --git a/materialious/electron/electron-builder.config.json b/materialious/electron/electron-builder.config.json
index f251e485..1e861508 100644
--- a/materialious/electron/electron-builder.config.json
+++ b/materialious/electron/electron-builder.config.json
@@ -34,7 +34,11 @@
   },
   "win": {
     "publish": [
-      "github"
+      {
+        "provider": "github",
+        "vPrefixedTagName": false,
+        "releaseType": "release"
+      }
     ],
     "target": [
       {
@@ -62,14 +66,22 @@
   },
   "mac": {
     "publish": [
-      "github"
+      {
+        "provider": "github",
+        "vPrefixedTagName": false,
+        "releaseType": "release"
+      }
     ],
     "category": "Entertainment",
     "target": "dmg"
   },
   "linux": {
     "publish": [
-      "github"
+      {
+        "provider": "github",
+        "vPrefixedTagName": false,
+        "releaseType": "release"
+      }
     ],
     "target": [
       {
@@ -134,4 +146,4 @@
       "libsecret-1-0"
     ]
   }
-}
+}
\ No newline at end of file

From 86e3cd1a9c47b71ba24238e9b698fbe2fd1b5f9a Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Sat, 30 Nov 2024 14:47:32 +1300
Subject: [PATCH 2/2] Build android after desktop completed

---
 .github/workflows/prod-android.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/prod-android.yml b/.github/workflows/prod-android.yml
index 5b0986cd..f6a70fc3 100644
--- a/.github/workflows/prod-android.yml
+++ b/.github/workflows/prod-android.yml
@@ -1,10 +1,9 @@
 name: Build Android
 on:
-  push:
-    branches:
-      - 'main'
-    paths-ignore:
-      - '**/README.md'
+  workflow_run:
+    workflows: ["Build desktop"]
+    types:
+      - completed
 
 permissions:
   contents: write