From 92453a0814e2dc62db35e0ed76137cc383e3ab92 Mon Sep 17 00:00:00 2001 From: Jin Seop Kim <1007sky@gmail.com> Date: Wed, 9 Jul 2025 14:12:16 -0700 Subject: [PATCH] feat: next release from main branch is 6.97.0 --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index 4eb99a985a0..efc1cdc4b60 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -46,3 +46,7 @@ branches: bumpMinorPreMajor: true handleGHRelease: true branch: 6.88.x + - releaseType: java-backport + bumpMinorPreMajor: true + handleGHRelease: true + branch: 6.96.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 4510689141c..3fe63bc890d 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -182,6 +182,27 @@ branchProtectionRules: - units-with-multiplexed-session (11) - unmanaged_dependency_check - library_generation + - pattern: 6.96.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - javadoc + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - 'Kokoro - Test: Integration with Multiplexed Sessions' + - cla/google + - checkstyle + - compile (8) + - compile (11) + - units-with-multiplexed-session (8) + - units-with-multiplexed-session (11) + - unmanaged_dependency_check + - library_generation permissionRules: - team: yoshi-admins permission: admin