From c70906f5b78d0964449ca0c199249802c9a128e8 Mon Sep 17 00:00:00 2001 From: Bryce Anderson Date: Wed, 15 Jan 2025 13:55:46 -0700 Subject: [PATCH 1/2] scripts: fix release script Motivation: When we upgraded gradle from 8.8 to 8.12 the JVM reporting format changed and that broke our release script in the part that ensures we're using the correct JVM to build docs. Modifications: - Fix the script --- scripts/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release.sh b/scripts/release.sh index 58b1247b5e..16670384c8 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -54,7 +54,7 @@ if [ "$#" -ne "2" ]; then fi # Enforce JDK17 to get latest LTS javadoc format/features (search, etc.): -java_version=$(./gradlew --no-daemon -version | grep ^JVM: | awk -F\. '{gsub(/^JVM:[ \t]*/,"",$1); print $1"."$2}') +java_version=$(./gradlew --no-daemon -version | grep 'Launcher JVM:' | awk -F\. '{gsub(/Launcher JVM:[ \t]*/,"",$1); print $1"."$2}') if [ "$java_version" != "17.0" ]; then echo "Docs can be published only using Java 17, current version: $java_version" exit 1 From 783d541c1109b0cf5c0bc179c0242cb9529eef0d Mon Sep 17 00:00:00 2001 From: Bryce Anderson Date: Wed, 15 Jan 2025 14:28:00 -0700 Subject: [PATCH 2/2] Fix line length --- scripts/release.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/release.sh b/scripts/release.sh index 16670384c8..5cf344c6a1 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -54,7 +54,8 @@ if [ "$#" -ne "2" ]; then fi # Enforce JDK17 to get latest LTS javadoc format/features (search, etc.): -java_version=$(./gradlew --no-daemon -version | grep 'Launcher JVM:' | awk -F\. '{gsub(/Launcher JVM:[ \t]*/,"",$1); print $1"."$2}') +java_version=$(./gradlew --no-daemon -version | grep 'Launcher JVM:' | \ + awk -F\. '{gsub(/Launcher JVM:[ \t]*/,"",$1); print $1"."$2}') if [ "$java_version" != "17.0" ]; then echo "Docs can be published only using Java 17, current version: $java_version" exit 1