Apply #1235 and #1241 to dev branch #1240
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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>
6a89aeb to
c81e918
Compare
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 was referenced Mar 15, 2024
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a result of cherry-picks from a113b54 and 8646d73, the result of PRs #1235 and #1241, into the
devbranch. Adding as a PR, just to confirm nothing is broken, as #1235 had a fairly extensive footprint.