From 2406d8edb8129ba498a765404f28596e9d22ac77 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Wed, 28 Aug 2024 12:35:20 -0400 Subject: [PATCH 1/3] chore: Update to Protobuf-Java 4.27.4 --- .kokoro/build.sh | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 4239a1127..a65ffee4d 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -27,6 +27,81 @@ source ${scriptDir}/common.sh mvn -version echo ${JOB_TYPE} +# Store the current Java version since the version may change when installing sdk-platform-java +current_java_home=$JAVA_HOME + +# testing-infra-docker has Java 11 installed in java8 docker container. Use this as sdk-platform-java +# needs Java 11+ to run with GraalVM. For GH actions, JAVA11_HOME does not exist and would skip this. +if [ ! -z "${JAVA11_HOME}" ]; then + export JAVA_HOME="${JAVA11_HOME}" + export PATH=${JAVA_HOME}/bin:$PATH +fi + +# Get the current proto runtime version used in this repo +CURRENT_PROTO_VERSION=$(mvn -ntp help:effective-pom | +sed -n "/protobuf-java<\/artifactId>/,/<\/dependency>/ { + //{ + s/\(.*\)<\/version>/\1/p + q + } +}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') +echo "The current proto version is: ${CURRENT_PROTO_VERSION}" + +# Find the latest proto runtime version available +LATEST_PROTO_VERSION="4.27.4" +echo "The latest proto version is: ${LATEST_PROTO_VERSION}" + +# Only reinstall shared-deps again to test for a newer proto version +if [[ "${CURRENT_PROTO_VERSION}" != "${LATEST_PROTO_VERSION}" ]]; then + pushd /tmp + git clone https://github.com/googleapis/sdk-platform-java.git + pushd sdk-platform-java + pushd gapic-generator-java-pom-parent + sed -i "/.*<\/protobuf.version>/s/\(.*\).*\(<\/protobuf.version>\)/\1${LATEST_PROTO_VERSION}\2/" pom.xml + # sdk-platform-java + popd + + pushd sdk-platform-java-config + # Get current Shared-Deps version in sdk-platform-java + SHARED_DEPS_VERSION=$(mvn -ntp help:effective-pom | + sed -n "/sdk-platform-java-config<\/artifactId>/,/<\/dependency>/ { + //{ + s/\(.*\)<\/version>/\1/p + q + } + }" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + echo "Shared-Deps Version: ${SHARED_DEPS_VERSION}" + # sdk-platform-java + popd + + mvn clean install -q -ntp \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -T 1C + # /tmp + popd + + # Back to the original directory of the repo + popd + # Find all the poms with a reference to shared-deps and update to the new local version + poms=($(find . -name pom.xml)) + for pom in "${poms[@]}"; do + if grep -q "sdk-platform-java-config" "${pom}"; then + echo "Updating the pom: ${pom} to use shared-deps version: ${SHARED_DEPS_VERSION}" + sed -i "/sdk-platform-java-config<\/artifactId>/,/<\/parent>/ s/.*<\/version>/$SHARED_DEPS_VERSION<\/version>/" "${pom}" +# xmlstarlet ed --inplace -N x="http://maven.apache.org/POM/4.0.0" \ +# -u "//x:project/x:parent[x:artifactId='sdk-platform-java-config']/x:version" \ +# -v "${SHARED_DEPS_VERSION}" \ +# "${pom}" + fi + done +fi + +# Reset back to the original Java version if changed +export JAVA_HOME="${current_java_home}" +export PATH=${JAVA_HOME}/bin:$PATH + # attempt to install 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ mvn install -B -V -ntp \ From fe6bac7ce763df5fd125d346d050a4e0acbdd173 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 10 Sep 2024 17:19:02 -0400 Subject: [PATCH 2/3] chore: Test script --- .github/workflows/ci.yaml | 4 ++-- .kokoro/build.sh | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b91fa381f..8aa5b7b9e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -67,7 +67,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 8 + java-version: 17 - run: java -version - run: .kokoro/build.bat env: @@ -116,7 +116,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 8 + java-version: 17 - run: java -version - run: .kokoro/build.sh env: diff --git a/.kokoro/build.sh b/.kokoro/build.sh index a65ffee4d..99193c4db 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -30,13 +30,6 @@ echo ${JOB_TYPE} # Store the current Java version since the version may change when installing sdk-platform-java current_java_home=$JAVA_HOME -# testing-infra-docker has Java 11 installed in java8 docker container. Use this as sdk-platform-java -# needs Java 11+ to run with GraalVM. For GH actions, JAVA11_HOME does not exist and would skip this. -if [ ! -z "${JAVA11_HOME}" ]; then - export JAVA_HOME="${JAVA11_HOME}" - export PATH=${JAVA_HOME}/bin:$PATH -fi - # Get the current proto runtime version used in this repo CURRENT_PROTO_VERSION=$(mvn -ntp help:effective-pom | sed -n "/protobuf-java<\/artifactId>/,/<\/dependency>/ { @@ -53,6 +46,13 @@ echo "The latest proto version is: ${LATEST_PROTO_VERSION}" # Only reinstall shared-deps again to test for a newer proto version if [[ "${CURRENT_PROTO_VERSION}" != "${LATEST_PROTO_VERSION}" ]]; then + # testing-infra-docker has Java 11 installed in java8 docker container. Use this as sdk-platform-java + # needs Java 11+ to run with GraalVM. For GH actions, JAVA11_HOME does not exist and would skip this. + if [ ! -z "${JAVA11_HOME}" ]; then + export JAVA_HOME="${JAVA11_HOME}" + export PATH=${JAVA_HOME}/bin:$PATH + fi + pushd /tmp git clone https://github.com/googleapis/sdk-platform-java.git pushd sdk-platform-java @@ -96,11 +96,11 @@ if [[ "${CURRENT_PROTO_VERSION}" != "${LATEST_PROTO_VERSION}" ]]; then # "${pom}" fi done -fi -# Reset back to the original Java version if changed -export JAVA_HOME="${current_java_home}" -export PATH=${JAVA_HOME}/bin:$PATH + # Reset back to the original Java version if changed + export JAVA_HOME="${current_java_home}" + export PATH=${JAVA_HOME}/bin:$PATH +fi # attempt to install 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ From ee1a509caacdbf3566bd9d2d5a5698a335938b33 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Thu, 19 Sep 2024 11:24:00 -0400 Subject: [PATCH 3/3] chore: Update to Protobuf 4.28.2 --- .kokoro/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 99193c4db..5fe0edddf 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -41,7 +41,7 @@ sed -n "/protobuf-java<\/artifactId>/,/<\/dependency>/ { echo "The current proto version is: ${CURRENT_PROTO_VERSION}" # Find the latest proto runtime version available -LATEST_PROTO_VERSION="4.27.4" +LATEST_PROTO_VERSION="4.28.2" echo "The latest proto version is: ${LATEST_PROTO_VERSION}" # Only reinstall shared-deps again to test for a newer proto version