From fc5e7046867bab0b994c852eabfdbd01f83cb761 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 16 Oct 2024 15:32:48 +0100 Subject: [PATCH 1/2] jdk-23.0.1 release jdkBranch GA tag check using wrong repo Signed-off-by: Andrew Leonard --- pipelines/build/openjdk_pipeline.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pipelines/build/openjdk_pipeline.groovy b/pipelines/build/openjdk_pipeline.groovy index c5cdc5702..19ca13996 100644 --- a/pipelines/build/openjdk_pipeline.groovy +++ b/pipelines/build/openjdk_pipeline.groovy @@ -26,7 +26,8 @@ Map DEFAULTS_JSON = null def findGaCommitSHA(String jdkVersion, String jdkBranch, Boolean annotatedTag) { // Determine OpenJDK and Adoptium mirror repository def repo - if (jdkVersion.toInteger() >= 23) { + // Is it a jdk-23+ stablizationjdk branch version? ie.jdk-23, jdk-24, ... + if (jdkVersion.toInteger() >= 23 && !jdkBranch.contains("\.0")) { // jdk-23+ first release is a branch within the jdk(head) repository repo = "jdk" } else { From bd46a1881c86849bf920c45e72e31677712e857e Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 16 Oct 2024 15:38:01 +0100 Subject: [PATCH 2/2] jdk-23.0.1 release jdkBranch GA tag check using wrong repo Signed-off-by: Andrew Leonard --- pipelines/build/openjdk_pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/build/openjdk_pipeline.groovy b/pipelines/build/openjdk_pipeline.groovy index 19ca13996..d4e85f5c9 100644 --- a/pipelines/build/openjdk_pipeline.groovy +++ b/pipelines/build/openjdk_pipeline.groovy @@ -27,7 +27,7 @@ def findGaCommitSHA(String jdkVersion, String jdkBranch, Boolean annotatedTag) { // Determine OpenJDK and Adoptium mirror repository def repo // Is it a jdk-23+ stablizationjdk branch version? ie.jdk-23, jdk-24, ... - if (jdkVersion.toInteger() >= 23 && !jdkBranch.contains("\.0")) { + if (jdkVersion.toInteger() >= 23 && !jdkBranch.contains(".0")) { // jdk-23+ first release is a branch within the jdk(head) repository repo = "jdk" } else {