diff --git a/.github/release-please.yml b/.github/release-please.yml index 808e1c9f7..e62668eef 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -18,3 +18,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 2.0.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 2.2.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 0ac178c7d..c58a38000 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -73,6 +73,20 @@ branchProtectionRules: - lint - clirr - cla/google + - pattern: 2.2.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - units (8) + - units (11) + - windows + - dependencies (8) + - dependencies (11) + - lint + - clirr + - cla/google permissionRules: - team: yoshi-admins permission: admin