diff --git a/.github/release-please.yml b/.github/release-please.yml index d3b1697635a3..f0bbeae4040e 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -3,19 +3,24 @@ releaseType: java-yoshi manifest: true handleGHRelease: true branches: - - branch: 1.0.x - releaseType: java-backport - bumpMinorPreMajor: true - - branch: 1.13.x - releaseType: java-backport - - branch: 1.25.x - releaseType: java-backport - - branch: 1.37.x - releaseType: java-backport - - branch: 1.53.x - releaseType: java-backport - - branch: 1.61.x - releaseType: java-backport - - branch: 1.58.x - releaseType: java-backport - - branch: protobuf-4.x-rc + - branch: 1.0.x + releaseType: java-backport + bumpMinorPreMajor: true + - branch: 1.13.x + releaseType: java-backport + - branch: 1.25.x + releaseType: java-backport + - branch: 1.37.x + releaseType: java-backport + - branch: 1.53.x + releaseType: java-backport + - branch: 1.61.x + releaseType: java-backport + - branch: 1.58.x + releaseType: java-backport + - branch: protobuf-4.x-rc + - primaryBranch: main + releaseType: java-backport + manifest: true + handleGHRelease: true + branch: 1.77.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 8998d5502413..7e2fb502fd6d 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: 1.77.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