Skip to content

Commit e1947c1

Browse files
chore: use sdk-platform-java-config to consolidate build configs (#3144)
* chore: use sdk-platform-java-config to consolidate build configs * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * exclude .kokoro/presubmit from owlbot --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 3549037 commit e1947c1

File tree

7 files changed

+21
-8
lines changed

7 files changed

+21
-8
lines changed

.kokoro/continuous/graalvm-native-17.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.2"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.25.0"
77
}
88

99
env_vars: {

.kokoro/continuous/graalvm-native.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.2"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.25.0"
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native-17.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.25.0""
77
}
88
99
env_vars: {

.kokoro/presubmit/graalvm-native.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.25.0"
77
}
88

99
env_vars: {

owlbot.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
'.kokoro/nightly/samples.cfg',
2121
'.kokoro/nightly/integration.cfg',
2222
'.kokoro/presubmit/samples.cfg',
23+
'.kokoro/presubmit/graalvm-native.cfg',
24+
'.kokoro/presubmit/graalvm-native-17.cfg',
2325
'codecov.yaml',
2426
'renovate.json',
2527
'.kokoro/build.sh'

pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
<parent>
1515
<groupId>com.google.cloud</groupId>
16-
<artifactId>google-cloud-shared-config</artifactId>
17-
<version>1.7.1</version>
16+
<artifactId>sdk-platform-java-config</artifactId>
17+
<version>3.25.0</version>
1818
</parent>
1919

2020
<developers>
@@ -55,7 +55,6 @@
5555
<github.global.server>github</github.global.server>
5656
<site.installationModule>google-cloud-bigquery-parent</site.installationModule>
5757
<google-api-services-bigquery.version>v2-rev20240203-2.0.0</google-api-services-bigquery.version>
58-
<google.cloud.shared-dependencies.version>3.25.0</google.cloud.shared-dependencies.version>
5958
<arrow.version>15.0.0</arrow.version>
6059
</properties>
6160

@@ -64,7 +63,7 @@
6463
<dependency>
6564
<groupId>com.google.cloud</groupId>
6665
<artifactId>google-cloud-shared-dependencies</artifactId>
67-
<version>${google.cloud.shared-dependencies.version}</version>
66+
<version>${google-cloud-shared-dependencies.version}</version>
6867
<type>pom</type>
6968
<scope>import</scope>
7069
</dependency>

renovate.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@
1111
":autodetectPinVersions"
1212
],
1313
"ignorePaths": [".kokoro/requirements.txt"],
14+
"customManagers": [
15+
{
16+
"customType": "regex",
17+
"fileMatch": [
18+
"^.kokoro/continuous/graalvm-native.*.cfg$",
19+
"^.kokoro/presubmit/graalvm-native.*.cfg$"
20+
],
21+
"matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?<currentValue>.*?)\""],
22+
"depNameTemplate": "com.google.cloud:sdk-platform-java-config",
23+
"datasourceTemplate": "maven"
24+
}
25+
],
1426
"packageRules": [
1527
{
1628
"packagePatterns": [

0 commit comments

Comments
 (0)