From 62b1a39df90ef9de268ecf42755b2f0b65353154 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 27 Sep 2023 09:49:32 +0100 Subject: [PATCH 1/2] Exclude -ga from upstream tag search Signed-off-by: Andrew Leonard --- tools/nightly_build_and_test_stats.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/nightly_build_and_test_stats.groovy b/tools/nightly_build_and_test_stats.groovy index 5f73de596..60a835129 100644 --- a/tools/nightly_build_and_test_stats.groovy +++ b/tools/nightly_build_and_test_stats.groovy @@ -24,7 +24,7 @@ import java.time.temporal.ChronoUnit def getLatestOpenjdkBuildTag(String version) { def openjdkRepo = "https://github.com/openjdk/${version}.git" - def latestTag = sh(returnStdout: true, script:"git ls-remote --sort=-v:refname --tags ${openjdkRepo} | grep -v '\\^{}' | tr -s '\\t ' ' ' | cut -d' ' -f2 | sed \"s,refs/tags/,,\" | sort -V -r | head -1 | tr -d '\\n'") + def latestTag = sh(returnStdout: true, script:"git ls-remote --sort=-v:refname --tags ${openjdkRepo} | grep -v '\\^{}' | tr -s '\\t ' ' ' | cut -d' ' -f2 | sed \"s,refs/tags/,,\" | grep -v '\-ga' | sort -V -r | head -1 | tr -d '\\n'") echo "latest upstream openjdk/${version} tag = ${latestTag}" return latestTag From 297611b612341e77ceb5ef891122256992f0f61c Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 27 Sep 2023 09:52:41 +0100 Subject: [PATCH 2/2] Exclude -ga from upstream tag search Signed-off-by: Andrew Leonard --- tools/nightly_build_and_test_stats.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/nightly_build_and_test_stats.groovy b/tools/nightly_build_and_test_stats.groovy index 60a835129..9c3c3f7a5 100644 --- a/tools/nightly_build_and_test_stats.groovy +++ b/tools/nightly_build_and_test_stats.groovy @@ -24,7 +24,7 @@ import java.time.temporal.ChronoUnit def getLatestOpenjdkBuildTag(String version) { def openjdkRepo = "https://github.com/openjdk/${version}.git" - def latestTag = sh(returnStdout: true, script:"git ls-remote --sort=-v:refname --tags ${openjdkRepo} | grep -v '\\^{}' | tr -s '\\t ' ' ' | cut -d' ' -f2 | sed \"s,refs/tags/,,\" | grep -v '\-ga' | sort -V -r | head -1 | tr -d '\\n'") + def latestTag = sh(returnStdout: true, script:"git ls-remote --sort=-v:refname --tags ${openjdkRepo} | grep -v '\\^{}' | tr -s '\\t ' ' ' | cut -d' ' -f2 | sed \"s,refs/tags/,,\" | grep -v '\\-ga' | sort -V -r | head -1 | tr -d '\\n'") echo "latest upstream openjdk/${version} tag = ${latestTag}" return latestTag