Merge branch 'main' into release-please--branches--main

googleapis · Sep 9, 2024 · a5a8f15 · a5a8f15
2 parents b08a3b1 + b9d8ea4
commit a5a8f15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile
@@ -34,7 +34,7 @@ SHELL [ "/bin/bash", "-c" ]
 
 ARG OWLBOT_CLI_COMMITTISH=ac84fa5c423a0069bbce3d2d869c9730c8fdf550
 ARG PROTOC_VERSION=25.4
-ARG GRPC_VERSION=2.45.0
+ARG GRPC_VERSION=1.66.0
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 
@@ -82,9 +82,9 @@ RUN python -m pip install -r requirements.txt
 RUN python -m pip install .
 
 # Install nvm with node and npm
-ENV NODE_VERSION 2.45.0
+ENV NODE_VERSION 20.12.0
 WORKDIR /home
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v2.45.0/install.sh | bash
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
 RUN chmod o+rx /home/.nvm
 ENV NODE_PATH=/home/.nvm/versions/node/v${NODE_VERSION}/bin
 ENV PATH=${PATH}:${NODE_PATH}

diff --git a/generation_config.yaml b/generation_config.yaml
@@ -1,4 +1,4 @@
-googleapis_commitish: eb4c1ec02412e65c453ef0bfc4347731e64dcc82
+googleapis_commitish: cb39bdd75da491466f6c92bc73cd46b0fbd6ba9a
 # the libraries are ordered with respect to library name, which is
 # java-{library.library_name} or java-{library.api-shortname} when
 # library.library_name is not defined.