diff --git a/.github/release-please.yml b/.github/release-please.yml index c01275665..357021d86 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -16,3 +16,7 @@ branches: bumpMinorPreMajor: true handleGHRelease: true branch: 2.6.x + - releaseType: java-backport + bumpMinorPreMajor: true + handleGHRelease: true + branch: 2.16.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 7a120c78d..ab7506ed4 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -55,6 +55,16 @@ branchProtectionRules: - units (8) - units (11) - cla/google + - pattern: 2.16.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: true + requiredStatusCheckContexts: + - bazel + - units (8) + - units (11) + - cla/google permissionRules: - team: yoshi-admins permission: admin