Merge branch 'main' into PR #4026 to update

lqiu96 · lqiu96 · commit 893a1153df8d · 2025-12-05T03:46:41.000Z
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -54,3 +54,8 @@ branches:
     bumpMinorPreMajor: true
     handleGHRelease: true
     branch: 6.95.x
+  - releaseType: java-yoshi
+    bumpMinorPreMajor: true
+    handleGHRelease: true
+    branch: protobuf-4.x-rc
+    manifest: true
