From 7b9434b54ec4f38f120f5b61837801ef460c805c Mon Sep 17 00:00:00 2001
From: Jin Seop Kim <1007sky@gmail.com>
Date: Fri, 18 Jul 2025 11:42:19 -0700
Subject: [PATCH 1/2] feat: next release from main branch is 2.61.0

---
 .github/release-please.yml      | 30 ++++++++++++++++++++---
 .github/sync-repo-settings.yaml | 42 +++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 9717077566..80d149bc1d 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -10,9 +10,12 @@ extraFiles:
   - .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
+  - >-
+    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: 2.23.x
@@ -28,3 +31,24 @@ branches:
     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
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index bbe667c713..8ff710be70 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -124,6 +124,48 @@ branchProtectionRules:
       - showcase-native
       - showcase (11)
       - showcase (17)
+  - pattern: 2.59.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - build(8) except for gapic-generator-java
+      - build(8) for gapic-generator-java
+      - build (11)
+      - build (17)
+      - cla/google
+      - compatibility
+      - graalvm-presubmit-sdk-platform-java-a (java-graalvm-ci-prod)
+      - graalvm-presubmit-sdk-platform-java-b (java-graalvm-ci-prod)
+      - graalvm-presubmit-sdk-platform-java-c (java-graalvm-ci-prod)
+      - >-
+        graalvm-presubmit-sdk-platform-java-a-downstream-kms
+        (java-graalvm-ci-prod)
+      - >-
+        graalvm-presubmit-sdk-platform-java-b-downstream-kms
+        (java-graalvm-ci-prod)
+      - >-
+        graalvm-presubmit-sdk-platform-java-c-downstream-kms
+        (java-graalvm-ci-prod)
+      - >-
+        graalvm-presubmit-sdk-platform-java-a-downstream-kmsinventory
+        (java-graalvm-ci-prod)
+      - >-
+        graalvm-presubmit-sdk-platform-java-b-downstream-kmsinventory
+        (java-graalvm-ci-prod)
+      - >-
+        graalvm-presubmit-sdk-platform-java-c-downstream-kmsinventory
+        (java-graalvm-ci-prod)
+      - library_generation
+      - library-generation-integration-test (java-hermetic-build-prod)
+      - library-generation-lint-python
+      - library-generation-lint-shell
+      - library-generation-unit-tests
+      - lint
+      - should-run-library-generation-tests
+      - showcase (11)
+      - showcase (17)
 permissionRules:
   - team: cloud-java-team-teamsync
     permission: admin

From 033671da85ab2838532af73e625df43e92c4decc Mon Sep 17 00:00:00 2001
From: Jin Seop Kim <jinseop@google.com>
Date: Fri, 18 Jul 2025 16:15:31 -0400
Subject: [PATCH 2/2] fix: run tests to match main branch
 .github/workflows/ci.yaml

---
 .github/sync-repo-settings.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 8ff710be70..f53bb09494 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -166,6 +166,8 @@ branchProtectionRules:
       - should-run-library-generation-tests
       - showcase (11)
       - showcase (17)
+      - showcase (21)
+      - showcase (24)
 permissionRules:
   - team: cloud-java-team-teamsync
     permission: admin