[solr] 01/02: Add the new minor version (e.g. 9.1) also to main branch (#540)

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git

commit effcfc46e432aed4fcd1ec2902842f4ec126b1ef
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Wed Jan 19 20:10:03 2022 +0100

    Add the new minor version (e.g. 9.1) also to main branch (#540)
    
    Co-authored-by: Houston Putman <ho...@gmail.com>
---
 dev-tools/scripts/releaseWizard.yaml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yaml
index ead7d9d..7fe6914 100644
--- a/dev-tools/scripts/releaseWizard.yaml
+++ b/dev-tools/scripts/releaseWizard.yaml
@@ -435,7 +435,7 @@ groups:
       Make sure to follow the manual instructions printed by the script.
   - !Todo
     id: add_version_minor
-    title: Add a new minor version on stable branch
+    title: Add a new minor version on stable and unstable branches
     types:
     - major
     - minor
@@ -444,7 +444,7 @@ groups:
       next_version: "{{ release_version_major }}.{{ release_version_minor + 1 }}.0"
     commands: !Commands
       root_folder: '{{ git_checkout_folder }}'
-      commands_text: Run these commands to add the new minor version {{ next_version }} to the stable branch
+      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 }}
@@ -456,6 +456,19 @@ groups:
         comment: Make sure the edits done by `addVersion.py` are ok, then push
         cmd: git add -u .  && git commit -m "Add next minor version {{ next_version }}"  && git push
         logfile: commit-stable.log
+      - !Command
+        cmd: git checkout main
+        tee: true
+      - !Command
+        cmd: git pull --ff-only
+        tee: true
+      - !Command
+        cmd: python3 -u dev-tools/scripts/addVersion.py {{ next_version }}
+        tee: true
+      - !Command
+        comment: Make sure the edits done by `addVersion.py` are ok, then push
+        cmd: git add -u .  && git commit -m "Add next minor version {{ next_version }}"  && git push
+        logfile: commit-stable.log
   - !Todo
     id: sanity_check_doap
     title: Sanity check the DOAP files