mirror of
https://github.com/cryptomator/cryptomator.git
synced 2026-05-21 12:11:28 +00:00
if jdk is build with jep-493-flag, use jimage to extract wixhelper
This commit is contained in:
13
.github/workflows/win-exe.yml
vendored
13
.github/workflows/win-exe.yml
vendored
@@ -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: >
|
||||
@@ -185,9 +188,13 @@ jobs:
|
||||
- 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"
|
||||
$extractDir = New-Item -Path ".\dir-with-wixhelper" -ItemType Directory
|
||||
if( '${{ steps.jep-493-check.outputs.jvm-with-jmods }}' -eq 'true' ) {
|
||||
& $env:JAVA_HOME\bin\jmod.exe extract --dir=$extractDir "${env:JAVA_HOME}\jmods\jdk.jpackage.jmod"
|
||||
} else {
|
||||
& $env:JAVA_HOME\bin\jimage.exe extract --dir=$extractDir "${env:JAVA_HOME}\lib\modules"
|
||||
}
|
||||
Get-ChildItem -Recurse -Path $extractDir -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
|
||||
|
||||
Reference in New Issue
Block a user