Update master to main #1235
Update master to main #1235
Conversation
|
@H0R5E we renamed our "master" branch to "main". Can you review this PR and
|
|
@akeeste, as I said in Applications, you might want to consider renaming To redirect the docs, you're going to have to change this line so that the EDIT: I would say that the CI is fixed, given it ran successfully on this PR. |
|
@akeeste, I've added akeeste#13 which makes the change I suggested above and also adds a second redirect from |
|
One last comment, Adam, is that you will need to sync the |
* Add second redirect for old /mastet/index.html route * Build main branch rather than master * Make master directory before copy * Make url redirect relative to root
|
Thanks for your help @H0R5E! Once this is merged, I'll pull this and a few other bugfixes from master into dev. Since the docs will now redirect, I finished changing every reference to the old docs here and on WEC-Sim/WEC-Sim_Applications#59. The test to build the current branch docs is failing because it's trying to reference the main branch on the Applications repo, which does not exist yet. It will pass once the WEC-Sim_Applications branch name is renamed. Unfortunately from the labs, only @kmruehl has access to the Applications repo to rename master to main, and is unable to for two more weeks. @H0R5E do you have access here to do this? |
|
@akeeste, sorry for the delay in replying. I'll add a main branch to the repo now and we can check it's working OK, prior to changing the default. |
|
I've only found one more reference to the master branch documentation. It's a comment within the WECSim_Lib_PTOSim.slx but I can't find it for the life of me. I suggest we let that go for now since it should redirect anyways, and it's very unlikely to be used or found by anyone |
@akeeste, agreed. We can tidy up any little things in the future, and this is important to get merged ASAP. Thanks for the great work. |
* update CI to use main branch * update simulationClass to reference git commits on main * fix cubes.LIS file with merge conflicts * update repository tree references in docs from master to main * update readme and github workflow to run-tests-main.yml * update redirect in gh-pages-redirect.html * Add second redirect for old /mastet/index.html route * Build main branch rather than master * update other references to documentation --------- Co-authored-by: Mathew Topper <dataonlygreater@gmail.com>
* cherry picked from main branch * update CI to use main branch * update simulationClass to reference git commits on main * fix cubes.LIS file with merge conflicts * update repository tree references in docs from master to main * update readme and github workflow to run-tests-main.yml * update redirect in gh-pages-redirect.html * Add second redirect for old /mastet/index.html route * Build main branch rather than master * update other references to documentation --------- Co-authored-by: Mathew Topper <dataonlygreater@gmail.com>
As part of #1235, a sphinx option was incorrectly renamed from master_doc to main_doc. This PR corrects this using the root_doc option, available in Sphinx >= 4.
As part of #1235, a sphinx option was incorrectly renamed from master_doc to main_doc. This PR corrects this using the root_doc option, available in Sphinx >= 4.
As part of WEC-Sim#1235, a sphinx option was incorrectly renamed from master_doc to main_doc. This PR corrects this using the root_doc option, available in Sphinx >= 4.
This PR addresses a few outstanding names changes described in #1215 on updating master to main.
It updates every reference to the master branch in our repo, except in
release_notes.rstsince the master branch was valid at the time of those releases.Most of the lines changed come from correcting an old merge conflict in a LIS file