Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure all Mac & Windows jdk.jpackage jmod executables are correctly signed #831

Merged
merged 1 commit into from
Oct 26, 2023
Merged

Ensure all Mac & Windows jdk.jpackage jmod executables are correctly signed #831

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Open in desktop
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