Skip to content

Commit 43c97a3

Browse files
chore: Update generation configuration at Thu Apr 24 15:08:03 UTC 2025 (#2563)
* chore: Update generation configuration at Thu Apr 24 15:08:03 UTC 2025 * chore: generate libraries at Thu Apr 24 15:08:33 UTC 2025 * chore: remove old kokoro jobs --------- Co-authored-by: Diego Marquez <[email protected]>
1 parent a46793a commit 43c97a3

File tree

400 files changed

+10576
-1245
lines changed

Some content is hidden

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

400 files changed

+10576
-1245
lines changed

.github/generated-files-bot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ externalManifests:
66
file: '.github/readme/synth.metadata/synth.metadata'
77
jsonpath: '$.generatedFiles[*]'
88
ignoreAuthors:
9+
- 'cloud-java-bot'
910
- 'renovate-bot'
1011
- 'yoshi-automation'
1112
- 'release-please[bot]'

.github/scripts/update_generation_config.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,15 @@ set -e
1515
function get_latest_released_version() {
1616
local group_id=$1
1717
local artifact_id=$2
18-
latest=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json" | jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' | sort -V | tail -n 1)
19-
echo "${latest}"
18+
json_content=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json")
19+
latest=$(jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' <<< "${json_content}" | sort -V | tail -n 1)
20+
if [[ -z "${latest}" ]]; then
21+
echo "The latest version of ${group_id}:${artifact_id} is empty."
22+
echo "The returned json from maven.org is invalid: ${json_content}"
23+
exit 1
24+
else
25+
echo "${latest}"
26+
fi
2027
}
2128

2229
# Update a key to a new value in the generation config.

.github/sync-repo-settings.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ branchProtectionRules:
1515
- units (11)
1616
- 'Kokoro - Test: Integration'
1717
- cla/google
18-
- 'Kokoro - Test: Java GraalVM Native Image'
19-
- 'Kokoro - Test: Java 17 GraalVM Native Image'
18+
- 'Kokoro - Test: Java GraalVM Native Image A'
19+
- 'Kokoro - Test: Java GraalVM Native Image B'
20+
- 'Kokoro - Test: Java GraalVM Native Image C'
2021
- javadoc
2122
- conformance
2223
- library_generation

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- uses: actions/setup-java@v4
105105
with:
106106
distribution: temurin
107-
java-version: 11
107+
java-version: 17
108108
- run: java -version
109109
- run: .kokoro/build.sh
110110
env:

.github/workflows/hermetic_library_generation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.55.1
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.56.2
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

.github/workflows/renovate_config_check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
renovate_bot_config_validation:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111

1212
steps:
1313
- name: Checkout code
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Node.js
1717
uses: actions/setup-node@v4
1818
with:
19-
node-version: '20'
19+
node-version: '22'
2020

2121
- name: Install Renovate and Config Validator
2222
run: |

.github/workflows/samples.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/setup-java@v4
2525
with:
2626
distribution: temurin
27-
java-version: 8
27+
java-version: 17
2828
- name: Run checkstyle
2929
run: mvn -P lint --quiet --batch-mode checkstyle:check
3030
working-directory: samples/snippets

.github/workflows/update_generation_config.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ on:
1818
schedule:
1919
- cron: '0 2 * * *'
2020
workflow_dispatch:
21+
2122
jobs:
2223
update-generation-config:
23-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-24.04
2425
env:
2526
# the branch into which the pull request is merged
2627
base_branch: main
@@ -40,3 +41,4 @@ jobs:
4041
--repo ${{ github.repository }}
4142
env:
4243
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
44+

.kokoro/build.sh

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
2-
# Copyright 2019 Google LLC
2+
# Copyright 2025 Google LLC
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# https://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -33,7 +33,6 @@ retry_with_backoff 3 10 \
3333
-DskipTests=true \
3434
-Dclirr.skip=true \
3535
-Denforcer.skip=true \
36-
-Dcheckstyle.skip=true \
3736
-Dmaven.javadoc.skip=true \
3837
-Dgcloud.download.skip=true \
3938
-T 1C
@@ -43,21 +42,22 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI
4342
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
4443
fi
4544

45+
4646
RETURN_CODE=0
4747
set +e
4848

4949
case ${JOB_TYPE} in
5050
test)
5151
echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
52-
mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
52+
mvn test -B -ntp -Dfmt.skip=true -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
5353
RETURN_CODE=$?
5454
;;
5555
lint)
56-
mvn com.coveo:fmt-maven-plugin:check -B -ntp
56+
mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
5757
RETURN_CODE=$?
5858
;;
5959
javadoc)
60-
mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
60+
mvn javadoc:javadoc javadoc:test-javadoc -B -ntp -Dfmt.skip=true
6161
RETURN_CODE=$?
6262
;;
6363
integration)
@@ -69,17 +69,14 @@ integration)
6969
-Denforcer.skip=true \
7070
-Dcheckstyle.skip=true \
7171
-DskipUnitTests=true \
72+
-Dfmt.skip=true \
73+
-fae \
7274
verify
7375
RETURN_CODE=$?
7476
;;
7577
graalvm)
7678
# Run Unit and Integration Tests with Native Image
77-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
78-
RETURN_CODE=$?
79-
;;
80-
graalvm17)
81-
# Run Unit and Integration Tests with Native Image
82-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
79+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test -Dfmt.skip=true
8380
RETURN_CODE=$?
8481
;;
8582
samples)
@@ -103,6 +100,7 @@ samples)
103100
-DtrimStackTrace=false \
104101
-Dclirr.skip=true \
105102
-Denforcer.skip=true \
103+
-Dfmt.skip=true \
106104
-fae \
107105
verify
108106
RETURN_CODE=$?
@@ -112,7 +110,7 @@ samples)
112110
fi
113111
;;
114112
clirr)
115-
mvn -B -ntp -Denforcer.skip=true clirr:check
113+
mvn -B -ntp -Dfmt.skip=true -Denforcer.skip=true clirr:check
116114
RETURN_CODE=$?
117115
;;
118116
*)

.kokoro/presubmit/graalvm-native.cfg renamed to .kokoro/presubmit/graalvm-native-a.cfg

Lines changed: 6 additions & 6 deletions
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-public-resources/graalvm_sdk_platform_a:3.44.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {
@@ -17,11 +17,6 @@ env_vars: {
1717
value: "gcloud-devel"
1818
}
1919

20-
env_vars: {
21-
key: "INTEGRATION_TEST_ARGS"
22-
value: "-P bigtable-emulator-it,bigtable-prod-it,bigtable-prod-batch-it,enable-verbose-grpc-logs -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests -Dbigtable.kms_key_name=projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key -Dbigtable.wait-for-cmek-key-status=true"
23-
}
24-
2520
env_vars: {
2621
key: "GOOGLE_CLOUD_PROJECT"
2722
value: "gcloud-devel"
@@ -36,3 +31,8 @@ env_vars: {
3631
key: "SECRET_MANAGER_KEYS"
3732
value: "java-it-service-account"
3833
}
34+
35+
env_vars: {
36+
key: "IT_SERVICE_ACCOUNT_EMAIL"
37+
38+
}

0 commit comments

Comments
 (0)