diff --git a/.github/release-please.yml b/.github/release-please.yml index 9ee9a8a09..37639908e 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -2,21 +2,25 @@ bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi branches: - - branch: 1.39.2-sp - releaseType: java-lts - - branch: 1.40.x - releaseType: java-backport - - branch: 1.41.x - releaseType: java-backport - - branch: 1.42.x - releaseType: java-backport - - branch: 1.43.x - releaseType: java-backport - - branch: 1.44.x - releaseType: java-backport - - branch: 1.46.x - releaseType: java-backport - - branch: 1.47.x - releaseType: java-backport - - branch: protobuf-4.x-rc - manifest: true + - branch: 1.39.2-sp + releaseType: java-lts + - branch: 1.40.x + releaseType: java-backport + - branch: 1.41.x + releaseType: java-backport + - branch: 1.42.x + releaseType: java-backport + - branch: 1.43.x + releaseType: java-backport + - branch: 1.44.x + releaseType: java-backport + - branch: 1.46.x + releaseType: java-backport + - branch: 1.47.x + releaseType: java-backport + - branch: protobuf-4.x-rc + manifest: true + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 2.1.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 847471c38..618f9a4b2 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -125,6 +125,19 @@ branchProtectionRules: - dependencies (11) - clirr - cla/google + - pattern: 2.1.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - units (8) + - units (11) + - windows + - dependencies (8) + - dependencies (11) + - clirr + - cla/google permissionRules: - team: yoshi-admins permission: admin