From 9f0e7cd20d69e02a5916305bad7b25cd599816b6 Mon Sep 17 00:00:00 2001 From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com> Date: Thu, 26 Oct 2023 14:23:39 +0100 Subject: [PATCH] Ensure all Mac & Windows jdk.jpackage jmod executables are correctly signed (#831) Signed-off-by: Andrew Leonard --- pipelines/build/common/openjdk_build_pipeline.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index dc6f00a77..1b5445c3c 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -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" @@ -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