Skip to content

Commit 90ce211

Browse files
committed
Upload desktop binaries as Github Release assets
1 parent 583b9b1 commit 90ce211

File tree

3 files changed

+16
-30
lines changed

3 files changed

+16
-30
lines changed

.github/workflows/desktop_distribution.yml

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
push:
66
tags:
77
- '*'
8+
branches:
9+
- desktop-releases
810

911
# Allows you to run this workflow manually from the Actions tab
1012
workflow_dispatch:
@@ -25,11 +27,13 @@ jobs:
2527
# Single deploy job since we're just deploying
2628
conveyor:
2729
name: "Create desktop distributions"
28-
environment: production
30+
environment:
31+
name: github-pages
32+
url: ${{ steps.deployment.outputs.page_url }}
2933
runs-on: ubuntu-22.04
3034
env:
3135
CONVEYOR_AGREE_TO_LICENSE: "1"
32-
APP_VERSION: ${{ github.ref_name }}
36+
APP_VERSION: 3.22.0
3337
steps:
3438
- uses: actions/checkout@v2
3539
- uses: actions/setup-java@v3
@@ -47,32 +51,20 @@ jobs:
4751
signing_key: ${{ secrets.SIGNING_KEY }}
4852
agree_to_license: 1
4953
cache_key: conveyor-${{ matrix.os }}-${{ matrix.arch }}
50-
51-
- uses: actions/upload-artifact@v4
54+
- uses: softprops/action-gh-release@v2
55+
# if: github.ref_type == 'tag'
5256
with:
53-
name: download-page
54-
path: output
55-
retention-days: 1
57+
tag_name: '3.22.0'
58+
files: output/*!(download\.html|icon\.png)
5659

57-
deploy:
58-
environment:
59-
name: github-pages
60-
url: ${{ steps.deployment.outputs.page_url }}
61-
runs-on: ubuntu-latest
62-
needs: [conveyor]
63-
steps:
64-
- name: Download a single artifact
65-
uses: actions/download-artifact@v4
66-
with:
67-
name: download-page
68-
path: download
69-
- run: mv download/download.html download/index.html
60+
- run: mkdir -p pages_output/download
61+
- run: mv pages_output/output/{download.html,icon.png} download
7062
- name: Setup Pages
7163
uses: actions/configure-pages@v3
7264
- name: Upload artifact
7365
uses: actions/upload-pages-artifact@v1
7466
with:
75-
path: '.'
67+
path: pages_output
7668
- name: Deploy to GitHub Pages
7769
id: deployment
78-
uses: actions/deploy-pages@v2
70+
uses: actions/deploy-pages@v4

conveyor.conf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@ app {
1515
display-name = "WFRP Master"
1616
license = "GPL-3"
1717
rdns-name = "cz.frantisekmasa.wfrp-master"
18-
vcs-url = "https://github.com/fmasa/wfrp-master"
18+
vcs-url = "github.com/fmasa/wfrp-master"
1919
icons = "app/src/main/res/mipmap-xxxhdpi/ic_launcher.png"
20-
21-
site {
22-
base-url = "https://fmasa.github.io/wfrp-master/download"
23-
}
2420
}
2521

2622
conveyor.compatibility-level = 17

desktop/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ compose.desktop {
5454
packageVersion = System.getenv("APP_VERSION") ?: "1.0.0"
5555

5656
windows {
57-
menuGroup = "Compose Examples"
58-
// see https://wixtoolset.org/documentation/manual/v3/howtos/general/generate_guids.html
59-
upgradeUuid = "BF9CDA6A-1391-46D5-9ED5-383D6E68CCEB"
57+
upgradeUuid = "F73A74E2-BF36-4883-B4AE-ABC289D0816C"
6058
}
6159

6260
nativeDistributions {

0 commit comments

Comments
 (0)