mirror of
https://github.com/cryptomator/cryptomator.git
synced 2026-09-21 07:24:37 +00:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0da557068b | ||
|
|
50fb1c3042 | ||
|
|
f2525791f8 | ||
|
|
01d9fe32b5 | ||
|
|
68e0da37f5 |
@@ -129,6 +129,16 @@ jobs:
|
|||||||
- name: Change win-console flag if debug is active
|
- name: Change win-console flag if debug is active
|
||||||
if: ${{ inputs.isDebug }}
|
if: ${{ inputs.isDebug }}
|
||||||
run: echo "WIN_CONSOLE_FLAG=--win-console" >> $GITHUB_ENV
|
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
|
- name: Run jpackage
|
||||||
run: >
|
run: >
|
||||||
${JAVA_HOME}/bin/jpackage
|
${JAVA_HOME}/bin/jpackage
|
||||||
@@ -167,6 +177,8 @@ jobs:
|
|||||||
--resource-dir dist/win/resources
|
--resource-dir dist/win/resources
|
||||||
--icon dist/win/resources/Cryptomator.ico
|
--icon dist/win/resources/Cryptomator.ico
|
||||||
${WIN_CONSOLE_FLAG}
|
${WIN_CONSOLE_FLAG}
|
||||||
|
env:
|
||||||
|
JAVA_HOME: ${{ steps.setup-patched-jdk.outputs.JAVA_HOME }}
|
||||||
- name: Patch Application Directory
|
- name: Patch Application Directory
|
||||||
run: |
|
run: |
|
||||||
cp dist/win/contrib/* appdir/Cryptomator
|
cp dist/win/contrib/* appdir/Cryptomator
|
||||||
@@ -262,6 +274,7 @@ jobs:
|
|||||||
--license-file dist/win/resources/license.rtf
|
--license-file dist/win/resources/license.rtf
|
||||||
--file-associations dist/win/resources/FAvaultFile.properties
|
--file-associations dist/win/resources/FAvaultFile.properties
|
||||||
env:
|
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_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources # requires abs path, used in resources/main.wxs
|
||||||
JP_WIXHELPER_DIR: ${{ github.workspace }}\appdir
|
JP_WIXHELPER_DIR: ${{ github.workspace }}\appdir
|
||||||
- name: Codesign MSI
|
- name: Codesign MSI
|
||||||
@@ -361,6 +374,7 @@ jobs:
|
|||||||
working-directory: dist/win
|
working-directory: dist/win
|
||||||
run: >
|
run: >
|
||||||
wix build
|
wix build
|
||||||
|
-arch ${{ matrix.arch }}
|
||||||
-define BundleName="Cryptomator"
|
-define BundleName="Cryptomator"
|
||||||
-define BundleVersion="${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum}}"
|
-define BundleVersion="${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum}}"
|
||||||
-define BundleVendor="Skymatic GmbH"
|
-define BundleVendor="Skymatic GmbH"
|
||||||
|
|||||||
Reference in New Issue
Block a user