Merge branch 'main' into grpc-channel-using-s2a

rmehta19 · rmehta19 · commit cb5768f4d1dc · 2024-11-07T05:36:15.000-08:00
diff --git a/.cloudbuild/library_generation/cloudbuild-library-generation-push-prod.yaml b/.cloudbuild/library_generation/cloudbuild-library-generation-push-prod.yaml
@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation"
-  _GAPIC_GENERATOR_JAVA_VERSION: '2.46.2-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
+  _GAPIC_GENERATOR_JAVA_VERSION: '2.49.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
   _SHA_IMAGE_ID: "${_IMAGE_NAME}:${COMMIT_SHA}"
   _LATEST_IMAGE_ID: "${_IMAGE_NAME}:latest"
   _VERSIONED_IMAGE_ID: "${_IMAGE_NAME}:${_GAPIC_GENERATOR_JAVA_VERSION}"
diff --git a/hermetic_build/DEVELOPMENT.md b/hermetic_build/DEVELOPMENT.md
@@ -160,13 +160,18 @@ python hermetic_build/library_generation/cli/entry_point.py generate \
 1. Run the following command to build the image from source
 
    ```shell
-   docker build \
+   DOCKER_BUILDKIT=1 docker build \
      -f .cloudbuild/library_generation/library_generation.Dockerfile \
      -t local:image-tag \
      .
    ```
+   Please note that the build only works when using the new
+   [Docker BuildKit](https://docs.docker.com/build/buildkit/) (enabled through the `DOCKER_BUILDKIT` variable).
+   This is meant for local development only (in CloudTops) - GH Actions' Ubuntu-22.04 \
+   [comes with the latest Docker version](https://github.com/actions/runner-images/blob/e74605cd6d5407469cf224802f25057bafc23d70/images/ubuntu/Ubuntu2204-Readme.md?plain=1#L81-L83)
+   and is able to handle the build properly using the (updated) legacy builder.
    
-2. Set the version of gapic-generator-java
+3. Set the version of gapic-generator-java
 
    ```shell
    LOCAL_GENERATOR_VERSION=$(mvn \
@@ -177,7 +182,7 @@ python hermetic_build/library_generation/cli/entry_point.py generate \
      -q)
    ```
 
-3. Run the image
+4. Run the image
 
    ```shell
       # Assume you want to generate the library in the current working directory
diff --git a/release-please-config.json b/release-please-config.json
@@ -11,6 +11,7 @@
         ".cloudbuild/graalvm/cloudbuild-test-a.yaml",
         ".cloudbuild/graalvm/cloudbuild-test-b.yaml",
         ".cloudbuild/library_generation/cloudbuild-library-generation-push.yaml",
+        ".cloudbuild/library_generation/cloudbuild-library-generation-push-prod.yaml",
         ".cloudbuild/library_generation/library_generation.Dockerfile"
       ]
     }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`".cloudbuild/graalvm/cloudbuild-test-a.yaml",`
`12`	`12`	`".cloudbuild/graalvm/cloudbuild-test-b.yaml",`
`13`	`13`	`".cloudbuild/library_generation/cloudbuild-library-generation-push.yaml",`
	`14`	`+ ".cloudbuild/library_generation/cloudbuild-library-generation-push-prod.yaml",`
`14`	`15`	`".cloudbuild/library_generation/library_generation.Dockerfile"`
`15`	`16`	`]`
`16`	`17`	`}`