Skip to content

Commit 838fdff

Browse files
cindy-pengcindy-peng
authored
Merge branch 'main' into cindy/selective-gapic
2 parents edafba1 + 243b4da commit 838fdff

20 files changed

+198
-14
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.45.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.45.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
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+
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
19+
options:
20+
machineType: 'E2_HIGHCPU_8'
21+
logging: CLOUD_LOGGING_ONLY
22+
steps:
23+
- name: gcr.io/cloud-builders/docker
24+
args: [
25+
"build",
26+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}",
27+
"--file", "graalvm_c.Dockerfile",
28+
"--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION",
29+
"."
30+
]
31+
dir: .cloudbuild/graalvm
32+
id: graalvm-c-build
33+
waitFor: ["-"]
34+
35+
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
36+
waitFor: [ "graalvm-c-build" ]
37+
entrypoint: java
38+
args: [ '-version' ]
39+
id: java-version
40+
41+
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
42+
entrypoint: bash
43+
args: [ './.kokoro/presubmit/downstream-build.sh' ]
44+
waitFor: [ "graalvm-c-build" ]
45+
id: native-java-kms
46+
env:
47+
- 'MODULES_UNDER_TEST=java-kms'
48+
- 'GOOGLE_CLOUD_PROJECT=java-graalvm-ci-prod'

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

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
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+
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
19+
options:
20+
machineType: 'E2_HIGHCPU_8'
21+
logging: CLOUD_LOGGING_ONLY
22+
steps:
23+
- name: gcr.io/cloud-builders/docker
24+
args: [
25+
"build",
26+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}",
27+
"--file", "graalvm_c.Dockerfile",
28+
"--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION",
29+
"."
30+
]
31+
dir: .cloudbuild/graalvm
32+
id: graalvm-c-build
33+
waitFor: ["-"]
34+
35+
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
36+
waitFor: [ "graalvm-c-build" ]
37+
entrypoint: java
38+
args: [ '-version' ]
39+
id: java-version
40+
41+
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
42+
entrypoint: bash
43+
args: [ './.kokoro/presubmit/downstream-build.sh' ]
44+
waitFor: [ "graalvm-c-build" ]
45+
id: native-java-kmsinventory
46+
env:
47+
- 'MODULES_UNDER_TEST=java-kmsinventory'
48+
- 'GOOGLE_CLOUD_PROJECT=java-graalvm-ci-prod'

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

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
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+
_SHARED_DEPENDENCIES_VERSION: '3.45.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
19+
options:
20+
machineType: 'E2_HIGHCPU_8'
21+
logging: CLOUD_LOGGING_ONLY
22+
steps:
23+
- name: gcr.io/cloud-builders/docker
24+
args: [
25+
"build",
26+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}",
27+
"--file", "graalvm_c.Dockerfile",
28+
"--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION",
29+
"."
30+
]
31+
dir: .cloudbuild/graalvm
32+
id: graalvm-c-build
33+
waitFor: ["-"]
34+
35+
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
36+
waitFor: [ "graalvm-c-build" ]
37+
entrypoint: java
38+
args: [ '-version' ]
39+
id: java-version
40+
41+
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
42+
entrypoint: bash
43+
args: [ './.kokoro/presubmit/showcase-native.sh' ]
44+
waitFor: [ "graalvm-c-build" ]
45+
id: native-showcase

‎.cloudbuild/graalvm/cloudbuild.yaml

+18-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.45.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.15.1'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
steps:
2020
# GraalVM A build
2121
- name: gcr.io/cloud-builders/docker
@@ -45,11 +45,27 @@ steps:
4545
id: graalvm-b-build
4646
waitFor: [ "-" ]
4747

48+
# GraalVM C build
49+
- name: gcr.io/cloud-builders/docker
50+
args: [
51+
"build",
52+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}",
53+
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:infrastructure-public-image-$SHORT_SHA",
54+
"--file", "graalvm_c.Dockerfile",
55+
"--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION",
56+
"."
57+
]
58+
dir: .cloudbuild/graalvm
59+
id: graalvm-c-build
60+
waitFor: [ "-" ]
61+
4862
options:
4963
logging: CLOUD_LOGGING_ONLY
5064

5165
images:
5266
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}
5367
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}
68+
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:${_SHARED_DEPENDENCIES_VERSION}
5469
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:infrastructure-public-image-$SHORT_SHA
55-
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:infrastructure-public-image-$SHORT_SHA
70+
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:infrastructure-public-image-$SHORT_SHA
71+
- gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:infrastructure-public-image-$SHORT_SHA

‎.cloudbuild/graalvm/graalvm_c.Dockerfile

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
16+
ARG JAVA_SHARED_CONFIG_VERSION
17+
18+
FROM us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_c:$JAVA_SHARED_CONFIG_VERSION

‎.github/release-please.yml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ extraFiles:
88
- .cloudbuild/graalvm/cloudbuild.yaml
99
- .cloudbuild/graalvm/cloudbuild-test-a.yaml
1010
- .cloudbuild/graalvm/cloudbuild-test-b.yaml
11+
- .cloudbuild/graalvm/cloudbuild-test-c.yaml
1112
- .cloudbuild/library_generation/cloudbuild-library-generation-release.yaml
1213
- generation_config.yaml
1314
branches:

‎.github/sync-repo-settings.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,25 @@ branchProtectionRules:
1616
- compatibility
1717
- graalvm-presubmit-sdk-platform-java-a (java-graalvm-ci-prod)
1818
- graalvm-presubmit-sdk-platform-java-b (java-graalvm-ci-prod)
19+
- graalvm-presubmit-sdk-platform-java-c (java-graalvm-ci-prod)
1920
- >-
2021
graalvm-presubmit-sdk-platform-java-a-downstream-kms
2122
(java-graalvm-ci-prod)
2223
- >-
2324
graalvm-presubmit-sdk-platform-java-b-downstream-kms
2425
(java-graalvm-ci-prod)
26+
- >-
27+
graalvm-presubmit-sdk-platform-java-c-downstream-kms
28+
(java-graalvm-ci-prod)
2529
- >-
2630
graalvm-presubmit-sdk-platform-java-a-downstream-kmsinventory
2731
(java-graalvm-ci-prod)
2832
- >-
2933
graalvm-presubmit-sdk-platform-java-b-downstream-kmsinventory
3034
(java-graalvm-ci-prod)
35+
- >-
36+
graalvm-presubmit-sdk-platform-java-c-downstream-kmsinventory
37+
(java-graalvm-ci-prod)
3138
- library_generation
3239
- library-generation-integration-test (java-hermetic-build-prod)
3340
- library-generation-lint-python

‎gapic-generator-java-pom-parent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>com.google.cloud</groupId>
1717
<artifactId>google-cloud-shared-config</artifactId>
18-
<version>1.15.1</version>
18+
<version>1.15.4</version>
1919
<relativePath/>
2020
</parent>
2121

‎gax-java/gax-bom/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-shared-config</artifactId>
14-
<version>1.15.1</version>
14+
<version>1.15.4</version>
1515
<relativePath/>
1616
</parent>
1717

‎java-shared-dependencies/first-party-dependencies/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>com.google.cloud</groupId>
1717
<artifactId>google-cloud-shared-config</artifactId>
18-
<version>1.15.1</version>
18+
<version>1.15.4</version>
1919
<relativePath />
2020
</parent>
2121

‎java-shared-dependencies/upper-bound-check/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<groupId>com.google.cloud</groupId>
1717
<!-- The shared config has RequireUpperBoundDeps enforcer rule -->
1818
<artifactId>google-cloud-shared-config</artifactId>
19-
<version>1.15.1</version>
19+
<version>1.15.4</version>
2020
<relativePath/>
2121
</parent>
2222

‎java-showcase/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>com.google.cloud</groupId>
1515
<artifactId>google-cloud-shared-config</artifactId>
16-
<version>1.15.1</version>
16+
<version>1.15.4</version>
1717
<relativePath/>
1818
</parent>
1919

‎release-please-config.json

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
".cloudbuild/graalvm/cloudbuild.yaml",
1111
".cloudbuild/graalvm/cloudbuild-test-a.yaml",
1212
".cloudbuild/graalvm/cloudbuild-test-b.yaml",
13+
".cloudbuild/graalvm/cloudbuild-test-c.yaml",
1314
".cloudbuild/library_generation/cloudbuild-library-generation-push.yaml",
1415
".cloudbuild/library_generation/library_generation.Dockerfile",
1516
".cloudbuild/library_generation/library_generation_airlock.Dockerfile"

‎sdk-platform-java-config/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>com.google.cloud</groupId>
1515
<artifactId>google-cloud-shared-config</artifactId>
16-
<version>1.15.1</version>
16+
<version>1.15.4</version>
1717
</parent>
1818

1919
<properties>

0 commit comments

Comments
 (0)