diff --git a/.github/release-please.yml b/.github/release-please.yml index 541dd8bc79..c36c6b4820 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -22,3 +22,7 @@ branches: bumpMinorPreMajor: true handleGHRelease: true branch: 6.4.4-sp + - releaseType: java-backport + bumpMinorPreMajor: true + handleGHRelease: true + branch: 6.14.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 941d178b3f..9ae42dea9c 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -92,6 +92,23 @@ branchProtectionRules: - 'Kokoro - Test: Integration' - cla/google - checkstyle + - pattern: 6.14.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - checkstyle + - compile (8) + - compile (11) permissionRules: - team: yoshi-admins permission: admin