You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2024/01/12 22:55:20 UTC

(solr) branch branch_9x updated: ReleaseWizard commands to protect new minor branch (#2191)

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


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 5053799c3e1 ReleaseWizard commands to protect new minor branch (#2191)
5053799c3e1 is described below

commit 5053799c3e10f0dd14afb81a2782104818d17da9
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Fri Jan 12 23:54:20 2024 +0100

    ReleaseWizard commands to protect new minor branch (#2191)
    
    (cherry picked from commit 4bf1917b0683eed4869de364dc0cfb6c7387ed36)
---
 dev-tools/scripts/releaseWizard.yaml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yaml
index ddc7f744bbe..fa65a967f6d 100644
--- a/dev-tools/scripts/releaseWizard.yaml
+++ b/dev-tools/scripts/releaseWizard.yaml
@@ -389,7 +389,9 @@ groups:
   - !Todo
     id: create_minor_branch
     title: Create a new minor branch off the stable branch
-    description: In our case we'll create {{ release_branch }}
+    description: |
+      In our case we'll create {{ release_branch }}.
+      Also edit `.asf.yaml` to add the new branch under `protected_branches`.
     types:
     - major
     - minor
@@ -415,6 +417,15 @@ groups:
       - !Command
         cmd: git push --set-upstream origin {{ release_branch }}
         tee: true
+      - !Command
+        cmd: "{{ editor }} .asf.yaml"
+        comment: |
+          Add the new branch {{ release_branch }} under `protected_branches` in `.asf.yaml`. An editor will open.
+        stdout: true
+      - !Command
+        cmd: git add .asf.yaml && git commit -m "Add branch protection for {{ release_branch }}" && git push
+        logfile: commit-branch-protection.log
+        tee: true
   - !Todo
     id: update_minor_branch_prerelease_antora
     title: Update Ref Guide Metadata for new Minor Branch