From d0b9bdfcf9030282480d4e57e06d51ae453b3897 Mon Sep 17 00:00:00 2001 From: Jin Seop Kim <1007sky@gmail.com> Date: Fri, 18 Jul 2025 11:48:37 -0700 Subject: [PATCH 1/2] chore: create LTS branch 2.60.x --- .github/release-please.yml | 7 +++++++ .github/sync-repo-settings.yaml | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index d03526bce6a0..67eae62c4bb9 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -79,5 +79,12 @@ branches: - >- google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java branch: 2.61.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + extraFiles: + - >- + google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java + branch: 2.60.x extraFiles: - google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 1d404a41e430..2f0e231965e3 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -197,6 +197,26 @@ branchProtectionRules: - conformance - library_generation - unmanaged_dependency_check + - pattern: 2.60.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - 'Kokoro - Test: Java GraalVM Native Image A' + - 'Kokoro - Test: Java GraalVM Native Image B' + - 'Kokoro - Test: Java GraalVM Native Image C' + - javadoc + - conformance + - library_generation + - unmanaged_dependency_check permissionRules: - team: yoshi-admins permission: admin From a0f12cda4d07ad66dd7272e628de5ea05d94477f Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Fri, 18 Jul 2025 16:07:16 -0400 Subject: [PATCH 2/2] fix: match unittests run for main branch --- .github/sync-repo-settings.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 2f0e231965e3..7be7e5e5f109 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -206,8 +206,10 @@ branchProtectionRules: - dependencies (17) - lint - clirr - - units (8) - units (11) + - units (17) + - units (21) + - units (24) - 'Kokoro - Test: Integration' - cla/google - 'Kokoro - Test: Java GraalVM Native Image A'