From d3de5430676c7b632b0b046831efc505bda67b9b Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Wed, 6 Mar 2024 17:39:06 -0500 Subject: [PATCH 1/2] chore: add `jq` to hermetic build image definition (#2539) From https://github.com/diegomarquezp/google-cloud-java/actions/runs/8178920720/job/22363860250 ``` + /usr/local/lib/python3.11/site-packages/library_generation/owlbot/bin/write_clirr_ignore.sh /usr/local/lib/python3.11/site-packages/library_generation /workspace/google-cloud-java/java-datastore/proto-google-cloud-datastore-v1 /workspace/google-cloud-java/java-datastore /workspace/google-cloud-java/java-datastore/proto-google-cloud-datastore-v1/src/main/java /workspace/google-cloud-java/java-datastore/proto-google-cloud-datastore-v1 /workspace/google-cloud-java/java-datastore /usr/local/lib/python3.11/site-packages/library_generation/owlbot/bin/write_clirr_ignore.sh: line 29: jq: command not found Library postprocessing failed Error: Process completed with exit code 1. ``` This PR adds jq to the docker image ## Cause `write_clirr_ignore` only acts on the repo whenever there is no clirr_ignored_differences found. This occurs when generating a new library from scratch, and we've only testing against existing libraries (i.e. we didn't reach this call to `jq` in any of our previous testing). https://github.com/googleapis/sdk-platform-java/blob/92e91bc0d91a2619a87abf9b072229a3ab3f4d91/library_generation/owlbot/bin/write_clirr_ignore.sh#L24-L29 --- .cloudbuild/library_generation/library_generation.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile index 62a8c516de..4b3b1f4b1c 100644 --- a/.cloudbuild/library_generation/library_generation.Dockerfile +++ b/.cloudbuild/library_generation/library_generation.Dockerfile @@ -17,7 +17,7 @@ FROM gcr.io/cloud-devrel-public-resources/python # install tools RUN apt-get update && apt-get install -y \ - unzip openjdk-17-jdk rsync maven \ + unzip openjdk-17-jdk rsync maven jq \ && apt-get clean COPY library_generation /src From 4d3c06e361f18a851eca249ac34f357273bb0c51 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Thu, 7 Mar 2024 11:46:20 -0500 Subject: [PATCH 2/2] chore: fix renovate bot configs for java-shared-config updates (#2541) --- renovate.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 73fc6061c3..7e2f901c87 100644 --- a/renovate.json +++ b/renovate.json @@ -64,7 +64,7 @@ "^.cloudbuild/*" ], "matchStrings": [ - "_JAVA_SHARED_CONFIG_VERSION: \"(?.+?)\"" + " _JAVA_SHARED_CONFIG_VERSION: '(?.+?)'" ], "depNameTemplate": "com.google.cloud:google-cloud-shared-config", "datasourceTemplate": "maven" @@ -103,7 +103,8 @@ "^com.google.cloud:google-cloud-shared-config" ], "semanticCommitType": "build", - "semanticCommitScope": "deps" + "semanticCommitScope": "deps", + "enabled": true }, { "matchPackagePatterns": [