diff --git a/.github/release-please.yml b/.github/release-please.yml index 619db3b3c9ee..1b655307ebbb 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -23,3 +23,8 @@ branches: manifest: true handleGHRelease: true branch: 1.53.x + - primaryBranch: main + releaseType: java-backport + manifest: true + handleGHRelease: true + branch: 1.61.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 3cebf5835f09..ce2386948be8 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -97,6 +97,24 @@ branchProtectionRules: - header-check - library_generation - unmanaged_dependency_check + - pattern: 1.61.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