Skip to content

Commit 4bf3ade

Browse files
rmehta19rmehta19
committed
Merge branch 'main' into dont-check-transport-channel-endpoint
2 parents c4ed18e + 49a7ae5 commit 4bf3ade

File tree

61 files changed

+282
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+282
-204
lines changed

‎.bazeliskrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# See https://github.com/bazelbuild/bazelisk
2-
# As per b/302171264#comment5, 6.4.0 supports Java 21.
3-
USE_BAZEL_VERSION=6.4.0
2+
# Version required for Java 24 support (https://github.com/bazelbuild/bazel/commit/806a6e82320956b63f1351ebe2b0da8483f36f19).
3+
USE_BAZEL_VERSION=7.6.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.47.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.48.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.47.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.48.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'

‎.cloudbuild/graalvm/cloudbuild-test-c.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.47.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.48.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'

‎.cloudbuild/graalvm/cloudbuild.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.47.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.48.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
steps:
2020
# GraalVM A build

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Copyright 2025 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
timeout: 7200s # 2 hours
16+
substitutions:
17+
_GAPIC_GENERATOR_JAVA_VERSION: '2.57.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
18+
_IMAGE_NAME: "us-central1-docker.pkg.dev/cloud-sdk-production-pipeline/images-dev/java-library-generation"
19+
_SHA_IMAGE_ID: "${_IMAGE_NAME}:${COMMIT_SHA}"
20+
_VERSIONED_IMAGE_ID: "${_IMAGE_NAME}:${_GAPIC_GENERATOR_JAVA_VERSION}"
21+
steps:
22+
# Library generation build
23+
- name: gcr.io/cloud-builders/docker
24+
args: [
25+
"build",
26+
"-t", "${_SHA_IMAGE_ID}",
27+
"-t", "${_VERSIONED_IMAGE_ID}",
28+
"-f", ".cloudbuild/library_generation/library_generation_airlock.Dockerfile",
29+
"."
30+
]
31+
id: library-generation-build
32+
waitFor: ["-"]
33+
env:
34+
- 'DOCKER_BUILDKIT=1'
35+
36+
options:
37+
machineType: 'E2_HIGHCPU_8'
38+
requestedVerifyOption: VERIFIED # For provenance attestation generation
39+
40+
images:
41+
- ${_SHA_IMAGE_ID}
42+
- ${_VERSIONED_IMAGE_ID}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_GAPIC_GENERATOR_JAVA_VERSION: '2.57.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
17+
_GAPIC_GENERATOR_JAVA_VERSION: '2.58.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
1818
_PRIVATE_IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation"
1919
_PRIVATE_SHA_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:${COMMIT_SHA}"
2020
_PRIVATE_LATEST_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:latest"

‎.cloudbuild/library_generation/library_generation.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM docker.io/library/maven:3.9.9-eclipse-temurin-17-alpine@sha256:969014ee8852
2121
WORKDIR /sdk-platform-java
2222
COPY . .
2323
# {x-version-update-start:gapic-generator-java:current}
24-
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.57.1-SNAPSHOT"
24+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.58.1-SNAPSHOT"
2525
# {x-version-update-end}
2626

2727
# Download the java formatter
@@ -58,7 +58,7 @@ FROM docker.io/library/python:3.13.2-alpine3.20@sha256:816feb29731cdee64b15b0ae9
5858

5959
ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
6060
ARG PROTOC_VERSION=25.5
61-
ARG GRPC_VERSION=1.70.0
61+
ARG GRPC_VERSION=1.71.0
6262
ENV HOME=/home
6363
ENV OS_ARCHITECTURE="linux-x86_64"
6464

‎.cloudbuild/library_generation/library_generation_airlock.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/maven@sha256:d3f0
2121
WORKDIR /sdk-platform-java
2222
COPY . .
2323
# {x-version-update-start:gapic-generator-java:current}
24-
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.57.1-SNAPSHOT"
24+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.58.1-SNAPSHOT"
2525
# {x-version-update-end}
2626

2727
# Download the java formatter
@@ -60,7 +60,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:b83
6060

6161
ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
6262
ARG PROTOC_VERSION=25.5
63-
ARG GRPC_VERSION=1.70.0
63+
ARG GRPC_VERSION=1.71.0
6464
ENV HOME=/home
6565
ENV OS_ARCHITECTURE="linux-x86_64"
6666

‎.github/workflows/ci.yaml‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,40 @@ jobs:
9191
- name: Integration Tests
9292
run: |
9393
bazelisk --batch test //test/integration/...
94+
build-java-24:
95+
name: "build(24) except self-service clients"
96+
# Support for Java 24 is available for all use cases except self-service clients.
97+
runs-on: ubuntu-22.04
98+
steps:
99+
- uses: actions/checkout@v4
100+
- uses: actions/setup-java@v4
101+
with:
102+
java-version: 24
103+
distribution: temurin
104+
cache: maven
105+
- run: java -version
106+
- name: Unit Tests
107+
run: |
108+
mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
109+
-Dfmt.skip -DenableTestCoverage
110+
# The `envVarTest` profile runs tests that require an environment variable
111+
- name: Env Var Tests
112+
run: |
113+
mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
114+
-Dfmt.skip -DenableTestCoverage -PenvVarTest
115+
# Set the Env Var for this step only
116+
env:
117+
GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com
118+
GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS: true
119+
GOOGLE_SDK_JAVA_LOGGING: true
120+
- run: bazelisk version
121+
- name: Install Maven modules
122+
run: |
123+
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
124+
- name: Integration Tests
125+
# note need to set shouldInstallTestSecurityManager=false due to https://github.com/bazelbuild/bazel/issues/24354
126+
run: |
127+
bazelisk --batch test //test/integration/... --jvmopt=-Dcom.google.testing.junit.runner.shouldInstallTestSecurityManager=false
94128
build-java8-except-gapic-generator-java:
95129
name: "build(8) except for gapic-generator-java"
96130
runs-on: ubuntu-22.04
@@ -273,7 +307,7 @@ jobs:
273307
runs-on: ubuntu-22.04
274308
strategy:
275309
matrix:
276-
java: [ 11, 17, 21, 23 ]
310+
java: [ 11, 17, 21, 24 ]
277311
steps:
278312
- uses: actions/checkout@v4
279313
- uses: actions/setup-java@v4

0 commit comments

Comments
 (0)