From f586c5aa42cc0048c1fe556cc313d5699ab12598 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Tue, 14 Jan 2025 20:52:16 +0000 Subject: [PATCH 1/3] feat: next release from main branch is 1.46.0 --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index b1900aa11..0a7c18421 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -26,3 +26,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 1.44.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: bump-minor-v-for-LTS diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 5f2262e8a..e24ad1a98 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -98,6 +98,20 @@ branchProtectionRules: - dependencies (11) - clirr - cla/google + - pattern: bump-minor-v-for-LTS + 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 From cb5016a1faebeca160b047818fa08a422d3e10e6 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Wed, 15 Jan 2025 09:52:29 -0500 Subject: [PATCH 2/3] Update branch name --- .github/release-please.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 0a7c18421..25c418196 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -29,4 +29,4 @@ branches: - bumpMinorPreMajor: true handleGHRelease: true releaseType: java-backport - branch: bump-minor-v-for-LTS + branch: 2.51.x From fe9f7b3127fd70db629dcf9a91f69f4a56cb920f Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Wed, 15 Jan 2025 09:52:51 -0500 Subject: [PATCH 3/3] Update branch name to 2.51.x --- .github/sync-repo-settings.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index e24ad1a98..377dc997d 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -98,7 +98,7 @@ branchProtectionRules: - dependencies (11) - clirr - cla/google - - pattern: bump-minor-v-for-LTS + - pattern: 2.51.x isAdminEnforced: true requiredApprovingReviewCount: 1 requiresCodeOwnerReviews: true