From c6b01ea9a4495b83372880ebb4240614830368d8 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 4 May 2026 18:36:36 -0400 Subject: [PATCH 1/2] chore: Create a LTS branch for Datastore 2.x version --- .github/release-please.yml | 5 +++++ .github/sync-repo-settings.yaml | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index b78b60cf07ac..ade9a12e0bae 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -46,3 +46,8 @@ branches: onDemand: true local: true localCloneDepth: 200 + - branch: datastore-2.x + releaseType: java-backport + onDemand: true + local: true + localCloneDepth: 200 diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 4567dc3c1690..5d952624725d 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -133,6 +133,24 @@ branchProtectionRules: - header-check - library_generation - unmanaged_dependency_check + - pattern: datastore-2.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - units (8) + - units (11) + - units (17) + - cla/google + - lint + - 'Kokoro - Test: Integration' + - 'Kokoro - Test: GraalVM Native Image A' + - 'Kokoro - Test: GraalVM Native Image B' + - 'Kokoro - Test: GraalVM Native Image C' + - header-check + - library_generation + - unmanaged_dependency_check permissionRules: - team: yoshi-admins permission: admin From fc4f407ce8a8036a72c71f2ea5bf5087904d1ea7 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 4 May 2026 18:43:32 -0400 Subject: [PATCH 2/2] chore: Add datastore specific CIs --- .github/sync-repo-settings.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 5d952624725d..1d5d663d5df3 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -139,18 +139,17 @@ branchProtectionRules: requiresCodeOwnerReviews: true requiresStrictStatusChecks: false requiredStatusCheckContexts: - - units (8) - - units (11) - - units (17) + - split-units (java-datastore, 8) + - split-units (java-datastore, 11) + - split-units (java-datastore, 17) + - split-units (java-datastore, 21) + - split-units (java-datastore, 25) + - split-clirr (java-datastore) - cla/google - lint - 'Kokoro - Test: Integration' - - 'Kokoro - Test: GraalVM Native Image A' - - 'Kokoro - Test: GraalVM Native Image B' - - 'Kokoro - Test: GraalVM Native Image C' - - header-check - - library_generation - - unmanaged_dependency_check + - 'Kokoro - Test: Datastore Integration' + - 'Kokoro - Test: Datastore GraalVM Native Image' permissionRules: - team: yoshi-admins permission: admin