Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: Rename branches master->release, nightly->main #1153

Merged
merged 8 commits into from
Nov 27, 2024

Conversation

kdmccormick
Copy link
Collaborator

@kdmccormick kdmccormick commented Nov 7, 2024

TEP: https://discuss.openedx.org/t/tep-rename-nightly-next-and-master-release/12994

GitHub issue: #1096

We also incorporate the IS_NIGHTLY suggestion from this rejected bugfix PR, under the name TUTOR_BRANCH_IS_MAIN, as a reliable way of determining whether to patch for Tutor Release or Tutor Main.

To Do before merging:

  • Queue up PRs for the other core plugins
  • Make sure Edly is ready to update the GitLib pipelines
  • Make sure Regis is ready to rename the branch in GitHub
  • Maybe: Wait until after the Sumac release on Dec 9?

Immediately after merging:

  • Merge this same commit into Main (the auto-sync may be temporarily broken at this point)
  • Rebase this PR and merge it into Main: Change version suffix to 'main' and load plugins from their main branches #1154
  • Merge the core plugin PRs
  • Merge: Add Main index (and symlink Nightly to it) & Point at main plugin branches tpi#6
  • Edly: Merge GitLab pipline updates
  • Regis: Rename branches in GitHub
  • Put an announcement in the forums, x-posted to Slack, explaining how Nightly devs can migrate to Main:
    tutor dev stop
    OLD_ROOT="$(tutor config printroot)"
    OLD_PLUGINS_ROOT="$(tutor plugins printroot)"
    git branch -m nightly main
    git switch main
    git pull
    NEW_ROOT=$(tutor config printroot)"
    NEW_PLUGINS_ROOT=$(tutor plugins printroot)"
    mv "$OLD_ROOT" "$NEW_ROOT"`
    mv "$OLD_PLUGINS_ROOT" "$NEW_PLUGINS_ROOT"`
    tutor config save

docs/troubleshooting.rst Outdated Show resolved Hide resolved
tutor/env.py Outdated Show resolved Hide resolved
@kdmccormick kdmccormick force-pushed the kdmccormick/branch-rename-master branch 2 times, most recently from 463c5a3 to adc1662 Compare November 27, 2024 05:21
@kdmccormick kdmccormick changed the title feat!: Rename branches master->release, nightly->next feat!: Rename branches master->release, nightly->main Nov 27, 2024
BREAKING CHANGES:
* Change default TUTOR_ROOT folder name from tutor-nightly to
  tutor-main.
* Change default TUTOR_PLUGINS_ROOT folder name from
  tutor-nightly-plugins to tutor-main-plugins.

Other changes:
* Update container suffixes from _nightly to _main.
* Update "Tutor Nightly" in docs to "Tutor Main".
* Update references to "master" and "nightly" branches to "release"
  and "main", respectively.
* Update GitHub links to Tutor's master branch to its release branch.
* Update CI to also test main and release branches.

TEP: https://discuss.openedx.org/t/tep-rename-nightly-next-and-master-release/12994

GitHub issue: #1096
@kdmccormick kdmccormick force-pushed the kdmccormick/branch-rename-master branch from adc1662 to 215deb1 Compare November 27, 2024 05:54
@kdmccormick kdmccormick force-pushed the kdmccormick/branch-rename-master branch from 215deb1 to ed7c209 Compare November 27, 2024 06:05
@kdmccormick kdmccormick marked this pull request as ready for review November 27, 2024 06:05
@kdmccormick
Copy link
Collaborator Author

@regisb @DawoudSheraz I believe that this, #1154, and overhangio/tpi#6 are all ready to go. Of course, the exact sequencing of them and will depend on how you administer the branch renaming on the overhangio/Edly side.

I'm on holiday from now until Monday, so feel free to push changes to this PR, squash, rebase, merge, whatever you need to.

docs/index.rst Outdated Show resolved Hide resolved
This html page includes an obsolete notification that points to the new
"main" page.
@regisb
Copy link
Contributor

regisb commented Nov 27, 2024

Since Kyle is OOO, I have taken the liberty to add some changes to the PR. Let me know what you think @DawoudSheraz and then we can proceed with the branch renaming.

Both the project root and the plugins root will be automatically
migrated from the -"nightly" to the "-main" suffix if the destination
does not already exist.
@regisb regisb force-pushed the kdmccormick/branch-rename-master branch from f7dc775 to e483e8f Compare November 27, 2024 13:01
@regisb regisb merged commit a63eeee into release Nov 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

3 participants