diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml
index 8747c80..fd5c832 100644
--- a/.github/workflows/build-installers.yml
+++ b/.github/workflows/build-installers.yml
@@ -16,7 +16,7 @@ jobs:
build:
strategy:
matrix:
- os: [macos-14, ubuntu-latest, macos-latest]
+ os: [macos-14, windows-latest, ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
@@ -43,6 +43,11 @@ jobs:
- name: Add Wix to Path
run: echo "$HOME/target/wix" >> $GITHUB_PATH
if: matrix.os == 'windows-latest'
+ - name: Install blosc (Windows)
+ if: matrix.os == 'windows-latest'
+ run: |
+ pip install blosc --no-input --target src/test/resources
+ mv src/test/resources/bin/* src/test/resources
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v2
diff --git a/.github/workflows/publish-installers.yml b/.github/workflows/publish-installers.yml
index e383898..9325e34 100644
--- a/.github/workflows/publish-installers.yml
+++ b/.github/workflows/publish-installers.yml
@@ -5,7 +5,9 @@ name: Publish Installers
on:
push:
- tags: "paintera-conversion-helper-*.*.*"
+ tags:
+ - "paintera-conversion-helper-*.*.*"
+ - "prerelease-*"
workflow_dispatch:
@@ -31,6 +33,7 @@ jobs:
echo "VERSION=$tag_name" >> $GITHUB_ENV
- name: Rename Artifacts
run: |
+ mv Paintera-windows-latest-*/*.msi Paintera-${{ env.VERSION }}-Windows.msi
mv PainteraConvert-ubuntu-latest-*/*.deb PainteraConvert-${{ env.VERSION }}_x86_64.deb
mv PainteraConvert-macos-latest-*/*.pkg PainteraConvert-${{ env.VERSION }}-MacOS.pkg
mv PainteraConvert-macos-14-*/*.pkg PainteraConvert-${{ env.VERSION }}-MacOS-AppleSilicon.pkg
@@ -41,6 +44,7 @@ jobs:
tag_name: ${{ github.ref }}
prerelease: false
files: |
+ PainteraConvert-${{ env.VERSION }}-Windows.msi
PainteraConvert-${{ env.VERSION }}_x86_64.deb
PainteraConvert-${{ env.VERSION }}-MacOS.pkg
PainteraConvert-${{ env.VERSION }}-MacOS-AppleSilicon.pkg
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 03fceec..186a018 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
2.15.4
- 1.0.1
+ 1.0.2
paintera-convert
java.naming,java.management,java.sql
UTF-8
diff --git a/src/packaging/windows/jpackage.txt b/src/packaging/windows/jpackage.txt
index 7c7bbbd..78f534e 100644
--- a/src/packaging/windows/jpackage.txt
+++ b/src/packaging/windows/jpackage.txt
@@ -1,12 +1,18 @@
--type msi
---name "${app.name}"
+--name ${app.name}
+--app-version ${app.version}
+--win-menu
+--win-menu-group ${windows.vendor}
+--win-shortcut
--vendor ${windows.vendor}
--dest "${project.build.directory}/installer-${matrix.os}"
+
--main-class ${main-class}
--input "${project.build.directory}/dependency"
--runtime-image "${project.build.directory}/jvm-image"
--temp "${project.build.directory}/installer-work"
--java-options "-XX:MaxRAMPercentage=75"
+
--win-upgrade-uuid ${windows.upgrade.uuid}
--description "${project.description}"
--copyright "(C) ${windows.vendor}"