From 6dd41b7a9740247e2b6fbdbb0a78680d0ea1a761 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Fri, 5 Dec 2025 16:27:12 +0000 Subject: [PATCH 1/2] chore: cleanup release-please config - Remove redundant options already declared at the top level.\n- Remove bumpMinorPreMajor for repositories after the first major release. --- .github/release-please.yml | 74 ++++++++++++-------------------------- 1 file changed, 22 insertions(+), 52 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 9de4135d48..045aa418c3 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -4,56 +4,26 @@ handleGHRelease: true primaryBranch: main manifest: true extraFiles: - - WORKSPACE - - .cloudbuild/graalvm/cloudbuild.yaml - - .cloudbuild/graalvm/cloudbuild-test-a.yaml - - .cloudbuild/graalvm/cloudbuild-test-b.yaml - - .cloudbuild/graalvm/cloudbuild-test-c.yaml - - .cloudbuild/library_generation/cloudbuild-library-generation-release.yaml - - >- - hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg - - >- - hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg - - >- - hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg - - generation_config.yaml + - WORKSPACE + - .cloudbuild/graalvm/cloudbuild.yaml + - .cloudbuild/graalvm/cloudbuild-test-a.yaml + - .cloudbuild/graalvm/cloudbuild-test-b.yaml + - .cloudbuild/graalvm/cloudbuild-test-c.yaml + - .cloudbuild/library_generation/cloudbuild-library-generation-release.yaml + - >- + hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg + - >- + hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg + - >- + hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg + - generation_config.yaml branches: - - branch: protobuf-4.x-rc - bumpMinorPreMajor: true - handleGHRelease: true - manifest: true - releaseType: java-yoshi - - branch: 2.23.x - releaseType: java-backport - manifest: true - handleGHRelease: true - - branch: 2.40.x - releaseType: java-backport - manifest: true - handleGHRelease: true - - releaseType: java-backport - bumpMinorPreMajor: true - handleGHRelease: true - manifest: true - branch: 2.54.x - - releaseType: java-backport - bumpMinorPreMajor: true - handleGHRelease: true - primaryBranch: main - manifest: true - extraFiles: - - WORKSPACE - - .cloudbuild/graalvm/cloudbuild.yaml - - .cloudbuild/graalvm/cloudbuild-test-a.yaml - - .cloudbuild/graalvm/cloudbuild-test-b.yaml - - .cloudbuild/graalvm/cloudbuild-test-c.yaml - - >- - .cloudbuild/library_generation/cloudbuild-library-generation-release.yaml - - >- - hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg - - >- - hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg - - >- - hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg - - generation_config.yaml - branch: 2.59.x + - branch: protobuf-4.x-rc + - branch: 2.23.x + releaseType: java-backport + - branch: 2.40.x + releaseType: java-backport + - releaseType: java-backport + branch: 2.54.x + - releaseType: java-backport + branch: 2.59.x From 089b27e4c0a96a32e015314e3b70d1f7184dc2ce Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Fri, 5 Dec 2025 16:34:49 +0000 Subject: [PATCH 2/2] chore: reorder branch keys for consistency --- .github/release-please.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 045aa418c3..be562de230 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -23,7 +23,7 @@ branches: releaseType: java-backport - branch: 2.40.x releaseType: java-backport - - releaseType: java-backport - branch: 2.54.x - - releaseType: java-backport - branch: 2.59.x + - branch: 2.54.x + releaseType: java-backport + - branch: 2.59.x + releaseType: java-backport