From cdb2a01121570df3aabf67d16539eafff7796c61 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:43:57 -0400 Subject: [PATCH 1/4] was referencing wrong directory for ruby release build --- ruby/cloudbuild-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby/cloudbuild-release.yaml b/ruby/cloudbuild-release.yaml index 5b7f1e2e..bb34aa91 100644 --- a/ruby/cloudbuild-release.yaml +++ b/ruby/cloudbuild-release.yaml @@ -19,7 +19,7 @@ steps: - id: 'build-release' name: 'gcr.io/cloud-builders/docker' args: ['build', '-t', 'us-central1-docker.pkg.dev/$PROJECT_ID/release-images/yoshi-ruby/release', '.'] - dir: 'ruby/release' + dir: 'ruby/multi' waitFor: ['-'] # Results From 129797fc34e597d49f28123e2b4e593e37e85e22 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:56:19 -0400 Subject: [PATCH 2/4] update node 14 builds to use support gcloud python version --- node/14-user/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/14-user/Dockerfile b/node/14-user/Dockerfile index 3352a436..62be01a7 100644 --- a/node/14-user/Dockerfile +++ b/node/14-user/Dockerfile @@ -60,8 +60,8 @@ RUN echo 'export PATH="/home/node/.pyenv/bin:$PATH"' >> ~/.profile && \ ENV PATH="/home/node/.pyenv/bin:/home/node/.pyenv/shims:${PATH}" # Install python -RUN pyenv install 3.7.4 && \ - pyenv global 3.7.4 && \ +RUN pyenv install 3.10.13 && \ + pyenv global 3.10.13 && \ python3 -m pip install --upgrade pip setuptools # Install gcp-uploader and gcp-releasetool and their dependencies. From c3d36b433b8f59a607f6229917e7a2e7f78a078a Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Wed, 16 Oct 2024 13:54:39 -0400 Subject: [PATCH 3/4] revert uninteded change --- ruby/cloudbuild-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby/cloudbuild-release.yaml b/ruby/cloudbuild-release.yaml index bb34aa91..5b7f1e2e 100644 --- a/ruby/cloudbuild-release.yaml +++ b/ruby/cloudbuild-release.yaml @@ -19,7 +19,7 @@ steps: - id: 'build-release' name: 'gcr.io/cloud-builders/docker' args: ['build', '-t', 'us-central1-docker.pkg.dev/$PROJECT_ID/release-images/yoshi-ruby/release', '.'] - dir: 'ruby/multi' + dir: 'ruby/release' waitFor: ['-'] # Results From acf504ac8cff1591f473a64a75962f6e047b7fec Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:59:05 -0400 Subject: [PATCH 4/4] additionally create java 11 release build used by publish docs ex: java-logging-logback --- java/cloudbuild-release.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/java/cloudbuild-release.yaml b/java/cloudbuild-release.yaml index 1834b035..4847e1d9 100644 --- a/java/cloudbuild-release.yaml +++ b/java/cloudbuild-release.yaml @@ -25,6 +25,17 @@ steps: ["-i", "us-central1-docker.pkg.dev/$PROJECT_ID/release-images/java8", "--config", "java/java8.yaml", "-v"] waitFor: ["java8-build"] + # Java 11 build for publish docs + - name: gcr.io/cloud-builders/docker + args: [ "build", "-t", "us-central1-docker.pkg.dev/$PROJECT_ID/release-images/java11", "." ] + dir: java/java11 + id: java11-build + waitFor: [ "-" ] + - name: gcr.io/gcp-runtimes/structure_test + args: + [ "-i", "us-central1-docker.pkg.dev/$PROJECT_ID/release-images/java11", "--config", "java/java11.yaml", "-v" ] + waitFor: [ "java11-build" ] + # Java 17 build specifically for java-storage - name: gcr.io/cloud-builders/docker args: ["build", "-t", "us-central1-docker.pkg.dev/$PROJECT_ID/release-images/java17", "."] @@ -38,6 +49,7 @@ steps: images: - us-central1-docker.pkg.dev/$PROJECT_ID/release-images/java8 + - us-central1-docker.pkg.dev/$PROJECT_ID/release-images/java11 - us-central1-docker.pkg.dev/$PROJECT_ID/release-images/java17 options: