This is an automated email from the ASF dual-hosted git repository. sigram pushed a commit to branch branch_10x in repository https://gitbox.apache.org/repos/asf/solr.git
commit 4f3ce03276b4c5cac1194b1336739800738ee189 Author: David Smiley <[email protected]> AuthorDate: Sun Sep 27 13:38:01 2026 -0400 releaseWizard: branch off the LTS stable branch for LTS minor releases get_base_branch_name() always returned the plain stable branch for a minor release, even on an LTS line, so create_stable_branch and add_version_minor checked out the wrong base. Return the LTS stable branch when is_lts_release() is true, and have those two steps actually check out {{ base_branch }} instead of a hardcoded {{ stable_branch }}, so the fix takes effect. Co-Authored-By: Claude Sonnet 5 <[email protected]> (cherry picked from commit 72bbec8b082c281d06996ab2ef78430c83975ec3) --- dev-tools/scripts/releaseWizard.py | 2 ++ dev-tools/scripts/releaseWizard.yaml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-tools/scripts/releaseWizard.py b/dev-tools/scripts/releaseWizard.py index 6a4dd91c549..a2813ae53d5 100755 --- a/dev-tools/scripts/releaseWizard.py +++ b/dev-tools/scripts/releaseWizard.py @@ -457,6 +457,8 @@ class ReleaseState: if v.is_major_release(): return 'main' elif v.is_minor_release(): + if self.is_lts_release(): + return self.get_lts_stable_branch_name() return self.get_stable_branch_name() elif v.major == Version.parse(self.latest_version).major: return self.get_minor_branch_name() diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yaml index 0665b92eb03..c3ce686f399 100644 --- a/dev-tools/scripts/releaseWizard.yaml +++ b/dev-tools/scripts/releaseWizard.yaml @@ -409,7 +409,7 @@ groups: commands_text: Run these commands to create a release branch commands: - !Command - cmd: git checkout {{ stable_branch }} + cmd: git checkout {{ base_branch }} tee: true - !Command cmd: git pull --ff-only @@ -524,7 +524,7 @@ groups: commands_text: Run these commands to add the new minor version {{ next_version }} to the stable and unstable branches commands: - !Command - cmd: git checkout {{ stable_branch }} + cmd: git checkout {{ base_branch }} tee: true - !Command cmd: python3 -u dev-tools/scripts/addVersion.py {{ next_version }}
