diff --git a/.github/release-please.yml b/.github/release-please.yml index 14d4c507b..9f8d02d27 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -30,3 +30,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 1.46.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 1.47.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index b257bb300..f33a595ea 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -112,6 +112,20 @@ branchProtectionRules: - dependencies (11) - clirr - cla/google + - pattern: 1.47.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - units (7) + - units (8) + - units (11) + - windows + - dependencies (8) + - dependencies (11) + - clirr + - cla/google permissionRules: - team: yoshi-admins permission: admin