From 51bb73baa93e2fba52a43cd7974875c9f1ae8bd2 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 16:42:58 +0000 Subject: [PATCH 1/2] feat: next release from main branch is 2.27.0 --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 38 ++++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index cbb5be49c..3fd939966 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -34,3 +34,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 2.19.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 2.26.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 1af0c45a3..6abe07020 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -115,16 +115,16 @@ branchProtectionRules: requiresCodeOwnerReviews: true requiresStrictStatusChecks: false requiredStatusCheckContexts: - - dependencies (17) - - lint - - clirr - - units (8) - - units (11) - - 'Kokoro - Test: Integration' - - cla/google - - 'Kokoro - Test: Java GraalVM Native Image' - - 'Kokoro - Test: Java 17 GraalVM Native Image' - - javadoc + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - 'Kokoro - Test: Java GraalVM Native Image' + - 'Kokoro - Test: Java 17 GraalVM Native Image' + - javadoc - pattern: 2.15.x isAdminEnforced: true requiredApprovingReviewCount: 1 @@ -188,6 +188,24 @@ branchProtectionRules: - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' - javadoc + - pattern: 2.26.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - 'Kokoro - Test: Java GraalVM Native Image' + - 'Kokoro - Test: Java 17 GraalVM Native Image' + - javadoc + - library_generation + - unmanaged_dependency_check permissionRules: - team: yoshi-admins permission: admin From ccb5958027ddaf4f67d35c0fac6ea9ed63c05c00 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 12:58:56 -0500 Subject: [PATCH 2/2] revert formatting fix --- .github/sync-repo-settings.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 6abe07020..09c9c67d7 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -115,16 +115,16 @@ branchProtectionRules: requiresCodeOwnerReviews: true requiresStrictStatusChecks: false requiredStatusCheckContexts: - - dependencies (17) - - lint - - clirr - - units (8) - - units (11) - - 'Kokoro - Test: Integration' - - cla/google - - 'Kokoro - Test: Java GraalVM Native Image' - - 'Kokoro - Test: Java 17 GraalVM Native Image' - - javadoc + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - 'Kokoro - Test: Java GraalVM Native Image' + - 'Kokoro - Test: Java 17 GraalVM Native Image' + - javadoc - pattern: 2.15.x isAdminEnforced: true requiredApprovingReviewCount: 1