Upload desktop binaries as Github Release assets

Author: fmasa

.github/workflows/desktop_distribution.yml

@@ -5,13 +5,15 @@ on:
   push:
     tags:
       - '*'
+    branches:
+      - desktop-releases
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
-  contents: read
+  contents: write
   pages: write
   id-token: write
 
@@ -25,11 +27,13 @@ jobs:
   # Single deploy job since we're just deploying
   conveyor:
     name: "Create desktop distributions"
-    environment: production
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-22.04
     env:
       CONVEYOR_AGREE_TO_LICENSE: "1"
-      APP_VERSION: ${{ github.ref_name }}
+      APP_VERSION: 3.22.0
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v3
@@ -47,32 +51,22 @@ jobs:
           signing_key: ${{ secrets.SIGNING_KEY }}
           agree_to_license: 1
           cache_key: conveyor-${{ matrix.os }}-${{ matrix.arch }}
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: download-page
-          path: output
-          retention-days: 1
-
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: [conveyor]
-    steps:
-      - name: Download a single artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: download-page
-          path: download
-      - run: mv download/download.html download/index.html
+      - name: Extract download page files from output
+        run: |
+          mkdir -p pages_output/download
+          mv output/download.html pages_output/download/index.html
+          mv output/icon.png pages_output/download
+      - name: Upload artifacts to Github Release
+        env:
+          GH_TOKEN: ${{ github.token }}
+#        run: gh release upload "$GITHUB_REF_NAME" output/* --clobber
+        run: gh release upload "3.22.0" output/* --clobber
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
-          path: '.'
+          path: pages_output
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

conveyor.conf

@@ -15,11 +15,11 @@ app {
   display-name = "WFRP Master"
   license = "GPL-3"
   rdns-name = "cz.frantisekmasa.wfrp-master"
-  vcs-url = "https://github.com/fmasa/wfrp-master"
+  vcs-url = "github.com/fmasa/wfrp-master"
   icons = "app/src/main/res/mipmap-xxxhdpi/ic_launcher.png"
 
   site {
-      base-url = "https://fmasa.github.io/wfrp-master/download"
+    consistency-checks = "warn"
   }
 }
 

desktop/build.gradle.kts

@@ -54,9 +54,7 @@ compose.desktop {
             packageVersion = System.getenv("APP_VERSION") ?: "1.0.0"
 
             windows {
-                menuGroup = "Compose Examples"
-                // see https://wixtoolset.org/documentation/manual/v3/howtos/general/generate_guids.html
-                upgradeUuid = "BF9CDA6A-1391-46D5-9ED5-383D6E68CCEB"
+                upgradeUuid = "F73A74E2-BF36-4883-B4AE-ABC289D0816C"
             }
 
             nativeDistributions {