Skip to content

Commit 2e98a00

Browse files
authored
Merge branch 'main' into dependabot/pip/hermetic_build/library_generation/jinja2-3.1.6
2 parents 4ec23dc + 0b1f78c commit 2e98a00

1,333 files changed

Lines changed: 106553 additions & 14631 deletions

File tree

Some content is hidden

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

.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-downstream-kms.yaml

Lines changed: 1 addition & 1 deletion
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.14.4'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.16.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 1 addition & 1 deletion
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.14.4'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.16.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.44.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.14.4'
17+
_SHARED_DEPENDENCIES_VERSION: '3.49.2' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.16.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 1 addition & 1 deletion
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.14.4'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.16.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 1 addition & 1 deletion
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.14.4'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.16.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.44.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.14.4'
17+
_SHARED_DEPENDENCIES_VERSION: '3.49.2' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.16.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY
Lines changed: 48 additions & 0 deletions
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.16.0'
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'
Lines changed: 48 additions & 0 deletions
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.16.0'
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'
Lines changed: 45 additions & 0 deletions
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.49.2' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.16.0'
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

0 commit comments

Comments
 (0)