[
https://issues.apache.org/jira/browse/SOLR-17249?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17839998#comment-17839998
]
Jan Høydahl commented on SOLR-17249:
------------------------------------
Thanks for catching this. That addition to the wizard was very recent, and you
are the first RM to try it. You are right, that the .asf.yaml must be edited on
main branch.
> Lack of clarity in branch protection instructions in releaseWizard
> ------------------------------------------------------------------
>
> Key: SOLR-17249
> URL: https://issues.apache.org/jira/browse/SOLR-17249
> Project: Solr
> Issue Type: Improvement
> Security Level: Public(Default Security Level. Issues are Public)
> Components: release-scripts
> Reporter: Gus Heck
> Priority: Major
>
> Since the branch is already made for 9.6 that step in checklist 3 has to be
> manually walked through (omitting the actual branch creation command). At the
> end it indicates that the branch should be protected, but he branch_9x (and
> 9_6) don't have a branch protection section in .asf.yml and I somewhat
> suspect that it's the main branch one that needs to be edited, but that's
> unclear from the instructions:
> {code:java}
> In our case we'll create branch_9_6.
> Also edit `.asf.yaml` to add the new branch under `protected_branches`.
> Run these commands to create a release branch
> cd ~/.solr-releases/9.6.0/solr
> git checkout branch_9x
> git pull --ff-only
> # This command should fail with exit code 2 to verify branch branch_9_6
> does not already exist
> git ls-remote --exit-code --heads origin branch_9_6
> git checkout -b branch_9_6
> git push --set-upstream origin branch_9_6
> # Add the new branch branch_9_6 under `protected_branches` in `.asf.yaml`.
> An editor will open.
> /usr/bin/nano .asf.yaml
> git add .asf.yaml && git commit -m "Add branch protection for branch_9_6"
> && git push
> {code}
> Either this is simply not yet available in 9_x or... there's an undocumented
> branch switch necessary here....
> Compare
> [https://github.com/apache/solr/blob/main/.asf.yaml]
> ([https://github.com/apache/solr/blob/3cc92cf7fecffe45c727f26fc299e1ab3d1b3f20/.asf.yaml)]
> vs
> [https://github.com/apache/solr/blob/branch_9_6/.asf.yaml]
> ([https://github.com/apache/solr/blob/6a2294db8ec1f4ecf21ec0f5b9bb3430ce6825e6/.asf.yaml])
>
> Not sure the solution or even 100% sure this is an actual problem because
> I've got an exceptional case from the branch already existing... but I'm
> filing this so it can be investigated.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
