diff --git a/.github/release-please.yml b/.github/release-please.yml index 801cc7dbe..c01275665 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -11,4 +11,8 @@ branches: - bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi - branch: java7 \ No newline at end of file + branch: java7 + - releaseType: java-backport + bumpMinorPreMajor: true + handleGHRelease: true + branch: 2.6.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 75b33019e..f77ddd5c2 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -51,6 +51,16 @@ branchProtectionRules: - units (8) - units (11) - cla/google + - pattern: 2.6.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: true + requiredStatusCheckContexts: + - bazel + - units (8) + - units (11) + - cla/google permissionRules: - team: yoshi-admins permission: admin