Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit 0fab3b6

Browse files
authored
Merge branch 'main' into renovate/com.google.cloud-google-cloud-bigtable-2.x
2 parents 9928562 + 77952d2 commit 0fab3b6

62 files changed

Lines changed: 1469 additions & 244 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.

.github/scripts/update_generation_config.sh

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,14 @@ function update_config() {
4848
}
4949

5050
# Update an action to a new version in GitHub action.
51+
# the second argument must have the git tag (including "v").
5152
function update_action() {
5253
local key_word=$1
5354
local new_value=$2
5455
local file=$3
5556
echo "Update ${key_word} to ${new_value} in ${file}"
5657
# use a different delimiter because the key_word contains "/".
57-
sed -i -e "s|${key_word}@v.*$|${key_word}@v${new_value}|" "${file}"
58+
sed -i -e "s|${key_word}@[^ ]*$|${key_word}@${new_value}|" "${file}"
5859
}
5960

6061
# The parameters of this script is:
@@ -143,12 +144,16 @@ rm -rf tmp-googleapis
143144
update_config "googleapis_commitish" "${latest_commit}" "${generation_config}"
144145

145146
# Update gapic-generator-java version to the latest
146-
latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-java")
147-
update_config "gapic_generator_version" "${latest_version}" "${generation_config}"
148-
149-
# Update composite action version to latest gapic-generator-java version
150-
update_action "googleapis/sdk-platform-java/.github/scripts" \
151-
"${latest_version}" \
147+
latest_gapic_generator_version=$(get_latest_released_version "com.google.api" "gapic-generator-java")
148+
update_config "gapic_generator_version" "${latest_gapic_generator_version}" "${generation_config}"
149+
150+
# Update the GitHub Actions reference to the latest.
151+
# After the google-cloud-java monorepo migration of sdk-platform-java,
152+
# we cannot rely on the gapic-generator-java version tag. Let's use
153+
# the gapic-libraries-bom version
154+
latest_gapic_libraries_bom_version=$(get_latest_released_version "com.google.cloud" "gapic-libraries-bom")
155+
update_action "googleapis/google-cloud-java/sdk-platform-java/.github/scripts" \
156+
"v${latest_gapic_libraries_bom_version}" \
152157
"${workflow}"
153158

154159
# Update libraries-bom version to the latest

.github/workflows/hermetic_library_generation.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.68.0
40+
- uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@google-cloud-shared-dependencies/v3.61.0
4141
if: env.SHOULD_RUN == 'true'
4242
with:
43+
image_tag: latest
4344
base_ref: ${{ github.base_ref }}
4445
head_ref: ${{ github.head_ref }}
4546
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}

.github/workflows/renovate_config_check.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
paths:
66
- 'renovate.json'
7+
- '.github/workflows/renovate_config_check.yaml'
78

89
jobs:
910
renovate_bot_config_validation:
@@ -18,8 +19,6 @@ jobs:
1819
with:
1920
node-version: '22'
2021

21-
- name: Install Renovate and Config Validator
22+
- name: Run Renovate Config Validator
2223
run: |
23-
npm install -g npm@latest
24-
npm install --global renovate
25-
renovate-config-validator
24+
npx --package renovate@43.136.0 renovate-config-validator

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
shell: bash
1515
run: .kokoro/build.sh
1616
- name: Unmanaged dependency check
17-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.58.0
17+
uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@v1.85.0
1818
with:
1919
bom-path: google-cloud-bigtable-bom/pom.xml

.kokoro/presubmit/graalvm-native-a.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-public-resources/graalvm_sdk_platform_a:3.59.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.61.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native-b.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-public-resources/graalvm_sdk_platform_b:3.59.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.61.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native-c.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-public-resources/graalvm_sdk_platform_c:3.59.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.61.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

.kokoro/presubmit/integration.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env_vars: {
88

99
env_vars: {
1010
key: "INTEGRATION_TEST_ARGS"
11-
value: "-P bigtable-prod-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"
11+
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"
1212
}
1313

1414
env_vars: {

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545

4646
## [2.75.0](https://github.com/googleapis/java-bigtable/compare/v2.74.0...v2.75.0) (2026-03-24)
4747

48+
### WARNING: This release contains a known bug with clientside metrics which was fixed in v2.75.1
4849

4950
### Features
5051

@@ -72,6 +73,7 @@
7273

7374
## [2.74.0](https://github.com/googleapis/java-bigtable/compare/v2.73.1...v2.74.0) (2026-03-02)
7475

76+
### WARNING: This release contains a known bug with clientside metrics which was fixed in v2.75.1
7577

7678
### Features
7779

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
4949
If you are using Gradle 5.x or later, add this to your dependencies:
5050

5151
```Groovy
52-
implementation platform('com.google.cloud:libraries-bom:26.79.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.80.0')
5353
5454
implementation 'com.google.cloud:google-cloud-bigtable'
5555
```

0 commit comments

Comments
 (0)