Compare commits

...

5 Commits

Author SHA1 Message Date
Armin Schrenk
0da557068b prevent usage of cached zip file 2025-06-30 17:04:10 +02:00
Armin Schrenk
50fb1c3042 use same jpackage for msi and appimage 2025-06-30 12:07:58 +02:00
Armin Schrenk
f2525791f8 fix path 2025-06-30 11:54:56 +02:00
Armin Schrenk
01d9fe32b5 use proper download url 2025-06-30 11:41:54 +02:00
Armin Schrenk
68e0da37f5 use patched jdk version to build msi on arm 2025-06-30 11:21:26 +02:00

View File

@@ -129,6 +129,16 @@ jobs:
- name: Change win-console flag if debug is active
if: ${{ inputs.isDebug }}
run: echo "WIN_CONSOLE_FLAG=--win-console" >> $GITHUB_ENV
- name: Setup patched JDK if necessary
id: setup-patched-jdk
run: |
if [ "${{ matrix.arch }}" == "arm64" ]; then
curl --output patched-jdk.zip -L "https://static.cryptomator.org/desktop/patched-win-jdk-2.zip"
unzip patched-jdk.zip -d patched-jdk
echo "JAVA_HOME=${{ github.workspace }}/patched-jdk/jdk" >> $GITHUB_OUTPUT
else
echo "JAVA_HOME=${JAVA_HOME}" >> $GITHUB_OUTPUT
fi
- name: Run jpackage
run: >
${JAVA_HOME}/bin/jpackage
@@ -167,6 +177,8 @@ jobs:
--resource-dir dist/win/resources
--icon dist/win/resources/Cryptomator.ico
${WIN_CONSOLE_FLAG}
env:
JAVA_HOME: ${{ steps.setup-patched-jdk.outputs.JAVA_HOME }}
- name: Patch Application Directory
run: |
cp dist/win/contrib/* appdir/Cryptomator
@@ -262,6 +274,7 @@ jobs:
--license-file dist/win/resources/license.rtf
--file-associations dist/win/resources/FAvaultFile.properties
env:
JAVA_HOME: ${{ steps.setup-patched-jdk.outputs.JAVA_HOME }}
JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources # requires abs path, used in resources/main.wxs
JP_WIXHELPER_DIR: ${{ github.workspace }}\appdir
- name: Codesign MSI
@@ -361,6 +374,7 @@ jobs:
working-directory: dist/win
run: >
wix build
-arch ${{ matrix.arch }}
-define BundleName="Cryptomator"
-define BundleVersion="${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum}}"
-define BundleVendor="Skymatic GmbH"