Compare commits

...

4 Commits

Author SHA1 Message Date
Armin Schrenk
5fd7fb874e remove wixhelper extract step 2025-11-13 14:58:22 +01:00
Armin Schrenk
18dce94658 if jdk is build with jep-493-flag, use jimage to extract wixhelper 2025-11-13 14:30:04 +01:00
Sebastian Stenzel
80a0281885 try different version name 2025-11-13 13:41:56 +01:00
Sebastian Stenzel
3eeceea64f try building with temurin jdk 26+23-ea 2025-11-13 13:29:38 +01:00

View File

@@ -47,8 +47,8 @@ jobs:
include:
- arch: x64
os: windows-latest
java-dist: 'zulu' #cannot use temurin, see https://github.com/cryptomator/cryptomator/issues/3824#issuecomment-2829827427
java-version: '25.0.1+8'
java-dist: 'temurin'
java-version: '26-ea'
java-package: 'jdk'
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -102,10 +102,13 @@ jobs:
id: jep-493-check
run: |
JMOD_PATHS="openjfx-jmods"
JVM_JMODS_PRESENT="false"
if ! $(${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"); then
JMOD_PATHS="${JAVA_HOME}/jmods;${JMOD_PATHS}"
JVM_JMODS_PRESENT="true"
fi
echo "jmod_paths=${JMOD_PATHS}" >> "$GITHUB_OUTPUT"
echo "jvm-with-jmods=${JVM_JMODS_PRESENT}" >> "$GITHUB_OUTPUT"
- name: Run jlink
# Remark: no compression is applied for improved build compression later (here msi)
run: >
@@ -182,12 +185,6 @@ jobs:
}
$jar.Dispose()
}
- name: Extract wixhelper.dll for Codesigning #see https://github.com/cryptomator/cryptomator/issues/3130
shell: pwsh
run: |
New-Item -Path appdir/jpackage-jmod -ItemType Directory
& $env:JAVA_HOME\bin\jmod.exe extract --dir jpackage-jmod "${env:JAVA_HOME}\jmods\jdk.jpackage.jmod"
Get-ChildItem -Recurse -Path "jpackage-jmod" -File wixhelper.dll | Select-Object -Last 1 | Copy-Item -Destination "appdir"
- name: Sign DLLs with Azure Trusted Signing
if: inputs.sign || github.event_name == 'release'
uses: ./.github/actions/win-sign-action