diff --git a/.github/release-please.yml b/.github/release-please.yml index efc1cdc4b60..c206376de63 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -50,3 +50,7 @@ branches: bumpMinorPreMajor: true handleGHRelease: true branch: 6.96.x + - releaseType: java-backport + bumpMinorPreMajor: true + handleGHRelease: true + branch: 6.95.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 3fe63bc890d..39ea467f10b 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -203,6 +203,27 @@ branchProtectionRules: - units-with-multiplexed-session (11) - unmanaged_dependency_check - library_generation + - pattern: 6.95.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