From 32b69454392cdbb431e43a554781becc79ece0ac Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Fri, 5 Dec 2025 16:27:35 +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 | 61 ++++++++++---------------------------- 1 file changed, 15 insertions(+), 46 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 3d79de3d2..67fbf3c7d 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -2,50 +2,19 @@ bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi branches: - - bumpMinorPreMajor: true - handleGHRelease: true - releaseType: java-yoshi - branch: java7 - - bumpMinorPreMajor: true - handleGHRelease: true - releaseType: java-backport - branch: 3.7.x - - bumpMinorPreMajor: true - handleGHRelease: true - releaseType: java-backport - extraFiles: - - >- - google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java - branch: 3.13.x - - bumpMinorPreMajor: true - handleGHRelease: true - releaseType: java-backport - extraFiles: - - >- - google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java - branch: 3.17.x - - bumpMinorPreMajor: true - handleGHRelease: true - releaseType: java-backport - extraFiles: - - >- - google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java - branch: 3.21.x - - bumpMinorPreMajor: true - handleGHRelease: true - releaseType: java-backport - extraFiles: - - >- - google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java - branch: 3.22.x - - bumpMinorPreMajor: true - handleGHRelease: true - releaseType: java-yoshi - extraFiles: - - >- - google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java - branch: protobuf-4.x-rc - manifest: true + - branch: java7 + - releaseType: java-backport + branch: 3.7.x + - releaseType: java-backport + branch: 3.13.x + - releaseType: java-backport + branch: 3.17.x + - releaseType: java-backport + branch: 3.21.x + - releaseType: java-backport + branch: 3.22.x + - branch: protobuf-4.x-rc + manifest: true extraFiles: - - >- - google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java + - >- + google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java From f91c80c19db8735b124d2dfc8013bed395d709a0 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Fri, 5 Dec 2025 16:42:05 +0000 Subject: [PATCH 2/2] chore: format release-please.yml --- .github/release-please.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 67fbf3c7d..02758fdf7 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -3,16 +3,16 @@ handleGHRelease: true releaseType: java-yoshi branches: - branch: java7 - - releaseType: java-backport - branch: 3.7.x - - releaseType: java-backport - branch: 3.13.x - - releaseType: java-backport - branch: 3.17.x - - releaseType: java-backport - branch: 3.21.x - - releaseType: java-backport - branch: 3.22.x + - branch: 3.7.x + releaseType: java-backport + - branch: 3.13.x + releaseType: java-backport + - branch: 3.17.x + releaseType: java-backport + - branch: 3.21.x + releaseType: java-backport + - branch: 3.22.x + releaseType: java-backport - branch: protobuf-4.x-rc manifest: true extraFiles: