Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Add the new minor version (e.g. 9.1) also to main branch (#540)

Jan Høydahld8bf2edb3719
diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yaml
index ead7d9d724b..7fe69147774 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