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

Only do exploded build for win/mac for specific builds #1145

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Only do exploded build for win/mac for specific builds #1145

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
12 changes: 9 additions & 3 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 @@ -1875,7 +1875,11 @@ def buildScriptsAssemble(
context.println '[CHECKOUT] Checking out to adoptium/temurin-build...'
repoHandler.checkoutAdoptBuild(context)
printGitRepoInfo()
if ((buildConfig.TARGET_OS == 'mac' || buildConfig.TARGET_OS == 'windows') && buildConfig.JAVA_TO_BUILD != 'jdk8u' && enableSigner) {
if ((buildConfig.TARGET_OS == 'mac' || buildConfig.TARGET_OS == 'windows') && (buildConfig.JAVA_TO_BUILD == 'jdk11u' ||
buildConfig.JAVA_TO_BUILD == 'jdk17u' ||
buildConfig.JAVA_TO_BUILD == 'jdk21u' ||
buildConfig.JAVA_TO_BUILD == 'jdk23u')
&& enableSigner) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this dual pass build with signing to resolve: adoptium/temurin-build#4057 (comment)
and adoptium/temurin-build#3997
I shall be working on a fix for these

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall I close this PR?

context.println "Generating exploded build" // , sign JMODS, and assemble build, for platform ${buildConfig.TARGET_OS} version ${buildConfig.JAVA_TO_BUILD}"
def signBuildArgs // Build args for make-adopt-build-farm.sh
if (env.BUILD_ARGS != null && !env.BUILD_ARGS.isEmpty()) {
Expand Down Expand Up @@ -1910,15 +1914,17 @@ def buildScriptsAssemble(
// eclipse-codesign and assemble sections were inlined here before
// https://github.com/adoptium/ci-jenkins-pipelines/pull/1117

} else { // Not Windows/Mac JDK11+ (i.e. doesn't require internal signing)
} else {
// Not Windows/Mac JDK11+ or JDK24+ built as linkable runtime (no jmods).
// i.e. doesn't require internal signing.
def buildArgs
if (env.BUILD_ARGS != null && !env.BUILD_ARGS.isEmpty()) {
buildArgs = env.BUILD_ARGS + openjdk_build_dir_arg
} else {
buildArgs = openjdk_build_dir_arg
}
context.withEnv(['BUILD_ARGS=' + buildArgs]) {
context.println "openjdk_build_pipeline: Calling MABF when not win/mac JDK11+ to do single-pass build and UASS=false"
context.println "openjdk_build_pipeline: Calling MABF when not win/mac JDK11+ or JDK24+ to do single-pass build and UASS=false"
batOrSh("bash ./${ADOPT_DEFAULTS_JSON['scriptDirectories']['buildfarm']}")
}
}
Expand Down