Skip to content

Commit

Permalink
Ensure all Mac & Windows jdk.jpackage jmod executables are correctly …
Browse files Browse the repository at this point in the history 
…signed (adoptium#831)

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
  • Loading branch information
@andrew-m-leonard @luhenry
andrew-m-leonard authored and luhenry committed Feb 3, 2024
1 parent f1f5e08 commit 9f0e7cd
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1500,8 +1500,8 @@ class Build {
includes: "${base_path}/hotspot/variant-server/**/*," +
"${base_path}/support/modules_cmds/**/*," +
"${base_path}/support/modules_libs/**/*," +
// JDK 16 + jpackage needs to be signed as well
"${base_path}/jdk/modules/jdk.jpackage/jdk/jpackage/internal/resources/jpackageapplauncher"
// JDK 16 + jpackage needs to be signed as well stash the resources folder containing the executables
"${base_path}/jdk/modules/jdk.jpackage/jdk/jpackage/internal/resources/*"

context.node('eclipse-codesign') {
context.sh "rm -rf ${base_path}/* || true"
Expand Down Expand Up @@ -1589,9 +1589,9 @@ class Build {
context.sh "rm -rf ${base_path}/hotspot/variant-server || true"
context.sh "rm -rf ${base_path}/support/modules_cmds || true"
context.sh "rm -rf ${base_path}/support/modules_libs || true"
// JDK 16 + jpackage needs to be signed as well
// JDK 16 + jpackage executables need to be signed as well
if (buildConfig.JAVA_TO_BUILD != 'jdk11u') {
context.sh "rm -rf ${base_path}/jdk/modules/jdk.jpackage/jdk/jpackage/internal/resources/jpackageapplauncher || true"
context.sh "rm -rf ${base_path}/jdk/modules/jdk.jpackage/jdk/jpackage/internal/resources/* || true"
}

// Restore signed JMODs
Expand Down

0 comments on commit 9f0e7cd

Please sign in to comment.