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

Use JDKxu config over JDKx config wherever possible #1069

Merged
merged 2 commits into from
Jul 12, 2024
Merged

Use JDKxu config over JDKx config wherever possible #1069

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a75f2b
Use JDKxu config over JDKx config wherever possible
adamfarley Jul 3, 2024
8d9a2ff
Merge branch 'master' into prioritise_jdkxu_over_jdkx
adamfarley Jul 9, 2024
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/openjdk_pipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,14 @@ node('worker') {
}

// Load buildConfigFilePath. This is where jdkxx_pipeline_config.groovy is located. It contains the build configurations for each platform, architecture and variant.
def buildConfigFilePath = (params.buildConfigFilePath) ?: "${DEFAULTS_JSON['configDirectories']['build']}/${javaToBuild}_pipeline_config.groovy"
def buildConfigFilePath = (params.buildConfigFilePath) ?: "${DEFAULTS_JSON['configDirectories']['build']}/${javaToBuild}u_pipeline_config.groovy"
adamfarley marked this conversation as resolved.
Show resolved Hide resolved

// Check if pipeline is jdk11 or jdk11u
def configPath = "${WORKSPACE}/${buildConfigFilePath}"
if (fileExists(configPath)) {
javaToBuild = (params.buildConfigFilePath) ? "${javaToBuild}" : "${javaToBuild}u"
println "Found ${buildConfigFilePath}"
} else {
javaToBuild = "${javaToBuild}u"
buildConfigFilePath = (params.buildConfigFilePath) ?: "${DEFAULTS_JSON['configDirectories']['build']}/${javaToBuild}_pipeline_config.groovy"
}

Expand All @@ -212,11 +212,11 @@ node('worker') {
javaToBuild = javaToBuild.replaceAll('u', '')

// Check if pipeline is jdk11 or jdk11u
configPath = "${WORKSPACE}/${ADOPT_DEFAULTS_JSON['configDirectories']['build']}/${javaToBuild}_pipeline_config.groovy"
configPath = "${WORKSPACE}/${ADOPT_DEFAULTS_JSON['configDirectories']['build']}/${javaToBuild}u_pipeline_config.groovy"
if (fileExists(configPath)) {
javaToBuild = "${javaToBuild}u"
buildConfigurations = load "${WORKSPACE}/${ADOPT_DEFAULTS_JSON['configDirectories']['build']}/${javaToBuild}_pipeline_config.groovy"
} else {
javaToBuild = "${javaToBuild}u"
buildConfigurations = load "${WORKSPACE}/${ADOPT_DEFAULTS_JSON['configDirectories']['build']}/${javaToBuild}_pipeline_config.groovy"
}
checkout scm
Expand Down