Skip to content

Commit fab1b38

Browse files
authored
Merge branch 'main' into renovate/checker-qual.version
2 parents 9d8693a + a31c682 commit fab1b38

File tree

30 files changed

+889
-306
lines changed

30 files changed

+889
-306
lines changed

.cloudbuild/graalvm/cloudbuild-test-a-downstream-kms.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ substitutions:
1818
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
21+
logging: CLOUD_LOGGING_ONLY
2122
steps:
2223
- name: gcr.io/cloud-builders/docker
2324
args: [

.cloudbuild/graalvm/cloudbuild-test-a-downstream-kmsinventory.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ substitutions:
1818
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
21+
logging: CLOUD_LOGGING_ONLY
2122
steps:
2223
- name: gcr.io/cloud-builders/docker
2324
args: [

.cloudbuild/graalvm/cloudbuild-test-a.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ substitutions:
1818
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
21+
logging: CLOUD_LOGGING_ONLY
2122
steps:
2223
- name: gcr.io/cloud-builders/docker
2324
args: [
@@ -41,4 +42,5 @@ steps:
4142
entrypoint: bash
4243
args: [ './.kokoro/presubmit/showcase-native.sh' ]
4344
waitFor: [ "graalvm-a-build" ]
44-
id: native-showcase
45+
id: native-showcase
46+

.cloudbuild/graalvm/cloudbuild-test-b-downstream-kms.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ substitutions:
1818
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
21+
logging: CLOUD_LOGGING_ONLY
2122
steps:
2223
- name: gcr.io/cloud-builders/docker
2324
args: [

.cloudbuild/graalvm/cloudbuild-test-b-downstream-kmsinventory.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ substitutions:
1818
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
21+
logging: CLOUD_LOGGING_ONLY
2122
steps:
2223
- name: gcr.io/cloud-builders/docker
2324
args: [

.cloudbuild/graalvm/cloudbuild-test-b.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ substitutions:
1818
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
21+
logging: CLOUD_LOGGING_ONLY
2122
steps:
2223
- name: gcr.io/cloud-builders/docker
2324
args: [

.cloudbuild/graalvm/cloudbuild.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ steps:
4545
id: graalvm-b-build
4646
waitFor: [ "-" ]
4747

48+
options:
49+
logging: CLOUD_LOGGING_ONLY
4850

4951
images:
5052
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}

.cloudbuild/library_generation/cloudbuild-library-generation-push-prod.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation"
18-
_GAPIC_GENERATOR_JAVA_VERSION: '2.46.2-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
18+
_GAPIC_GENERATOR_JAVA_VERSION: '2.49.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
1919
_SHA_IMAGE_ID: "${_IMAGE_NAME}:${COMMIT_SHA}"
2020
_LATEST_IMAGE_ID: "${_IMAGE_NAME}:latest"
2121
_VERSIONED_IMAGE_ID: "${_IMAGE_NAME}:${_GAPIC_GENERATOR_JAVA_VERSION}"
@@ -30,6 +30,8 @@ steps:
3030
"--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."]
3131
id: library-generation-build
3232
waitFor: ["-"]
33+
env:
34+
- 'DOCKER_BUILDKIT=1'
3335

3436
options:
3537
logging: CLOUD_LOGGING_ONLY

.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ steps:
3030
"--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."]
3131
id: library-generation-build
3232
waitFor: ["-"]
33+
env:
34+
- 'DOCKER_BUILDKIT=1'
3335

3436
options:
3537
logging: CLOUD_LOGGING_ONLY

.cloudbuild/library_generation/library_generation.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ FROM docker.io/library/python@sha256:38e179a0f0436c97ecc76bcd378d7293ab3ee79e4b8
5656

5757
ARG OWLBOT_CLI_COMMITTISH=38fe6f89a2339ee75c77739b31b371f601b01bb3
5858
ARG PROTOC_VERSION=25.5
59-
ARG GRPC_VERSION=1.67.1
59+
ARG GRPC_VERSION=1.68.1
6060
ARG JAVA_FORMAT_VERSION=1.7
6161
ENV HOME=/home
6262
ENV OS_ARCHITECTURE="linux-x86_64"

0 commit comments

Comments
 (0)