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

Add code to support publishing ea builds of JDK21 #740

Merged
merged 9 commits into from
Nov 13, 2023
Merged

Add code to support publishing ea builds of JDK21 #740

Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4acdc7b
Fix weekly check logic
sxa Jun 23, 2023
4e9e262
Add login to be able to auto-publish JDK22 ea builds
sxa Jun 27, 2023
7d4ce94
Fixes following linting/review
sxa Jun 28, 2023
f1c9cc1
Merge branch 'master' into jdk21ea_autopublish
sxa Jun 28, 2023
668fdf8
Fixup whitespace
sxa Jun 30, 2023
544c05f
Adjust for JDK21 and 22
sxa Nov 6, 2023
6278420
Adjust tag logic to handle publish of JDK21 weekly builds
sxa Nov 6, 2023
4106ddc
Updates following review
sxa Nov 7, 2023
cb5691c
Update build_base_file.groovy
sxa Nov 8, 2023
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
25 changes: 21 additions & 4 deletions pipelines/build/common/build_base_file.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,16 +765,33 @@ class Builder implements Serializable {
tag = publishName
}

if (javaToBuild=="jdk21" && scmReference && !release) {
publishName = scmReference.replace('_adopt','')
def firstDot=publishName.indexOf('.')
def plusSign=publishName.indexOf('+')
def secondDot=publishName.indexOf('.', firstDot+1)
// Translate jdk-AA+BB to jdk-AA-0-BB
// Translate jdk-AA.B.C+DD to jdk-AA-C-DD-ea-beta
// Note that jdk-AA-B-C-D+EE will become jdk-AA-C-D-EE-ea-beta
if ( firstDot==-1 ) {
publishName=publishName.substring(4,plusSign)+'.0.'+publishName.substring(plusSign+1)
} else {
publishName=publishName.substring(4,firstDot)+publishName.substring(secondDot).replace("+","-")
}
publishName='ea_'+publishName.replaceAll("\\.","-")
}

context.stage('publish') {
context.build job: 'build-scripts/release/refactor_openjdk_release_tool',
context.println "publishing with publishName: ${publishName}"
context.build job: 'build-scripts/release/refactor_openjdk_release_tool',
parameters: [
['$class': 'BooleanParameterValue', name: 'RELEASE', value: release],
['$class': 'BooleanParameterValue', name: 'DRY_RUN', value: ((releaseType=="Weekly" && javaVersion=="jdk21") ? true : false)],
andrew-m-leonard marked this conversation as resolved.
Show resolved Hide resolved
context.string(name: 'TAG', value: tag),
context.string(name: 'TIMESTAMP', value: timestamp),
context.string(name: 'TAG', value: (javaToBuild=="jdk21"?(scmReference.replace('_adopt','')):tag)),
andrew-m-leonard marked this conversation as resolved.
Show resolved Hide resolved
context.string(name: 'TIMESTAMP', value: (javaToBuild=="jdk"?publishName:timestamp)),
andrew-m-leonard marked this conversation as resolved.
Show resolved Hide resolved
context.string(name: 'UPSTREAM_JOB_NAME', value: env.JOB_NAME),
context.string(name: 'UPSTREAM_JOB_NUMBER', value: "${currentBuild.getNumber()}"),
context.string(name: 'VERSION', value: javaVersion )
context.string(name: 'VERSION', value: javaVersion)
]
}
}
Expand Down