diff --git a/.github/release-please.yml b/.github/release-please.yml index 31ea37cf1c5..cc9c93a2488 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -3,10 +3,15 @@ handleGHRelease: true manifest: true primaryBranch: main branches: - - branch: java7 - releaseType: java-yoshi - bumpMinorPreMajor: true - - branch: 26.1.x - releaseType: java-backport - - branch: protobuf-4.x-rc - releaseType: java-yoshi + - branch: java7 + releaseType: java-yoshi + bumpMinorPreMajor: true + - branch: 26.1.x + releaseType: java-backport + - branch: protobuf-4.x-rc + releaseType: java-yoshi + - releaseType: java-backport + handleGHRelease: true + manifest: true + primaryBranch: main + branch: 26.75.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 950fae33aa0..b9dc5e28da3 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -42,6 +42,19 @@ branchProtectionRules: - units (11) - cla/google - bom-content-test + - pattern: 26.75.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - cla/google + - bom-content-test permissionRules: - team: yoshi-admins permission: admin