diff --git a/.github/release-please.yml b/.github/release-please.yml index 701b57ed2..8275c4f37 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -14,3 +14,7 @@ branches: bumpMinorPreMajor: true handleGHRelease: true branch: 2.0.x + - releaseType: java-backport + bumpMinorPreMajor: true + handleGHRelease: true + branch: 2.1.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index bf50572e9..0689f05cb 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -38,6 +38,15 @@ branchProtectionRules: requiredApprovingReviewCount: 1 requiresCodeOwnerReviews: true requiresStrictStatusChecks: true + - pattern: 2.1.x + isAdminEnforced: true + requiredStatusCheckContexts: + - units + - format + - cla/google + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: true permissionRules: - team: Googlers permission: pull