Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/build-installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/publish-installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ name: Publish Installers

on:
push:
tags: "paintera-conversion-helper-*.*.*"
tags:
- "paintera-conversion-helper-*.*.*"
- "prerelease-*"
workflow_dispatch:


Expand All @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<jackson.version>2.15.4</jackson.version>

<!-- For JPackage -->
<app.version>1.0.1</app.version>
<app.version>1.0.2</app.version>
<app.name>paintera-convert</app.name>
<jvm.modules>java.naming,java.management,java.sql</jvm.modules>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
8 changes: 7 additions & 1 deletion src/packaging/windows/jpackage.txt
Original file line number Diff line number Diff line change
@@ -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}"