search

overhangio / tutor

The Docker-based Open edX distribution designed for peace of mind
https://docs.tutor.overhang.io/
GNU Affero General Public License v3.0
930 stars 444 forks source link

Tutor branches rename #1096

Open DawoudSheraz opened 4 months ago

DawoudSheraz commented 4 months ago

This issue is to track the implementation/changes proposed in https://discuss.openedx.org/t/tep-rename-nightly-main-and-master-release/12994.

kdmccormick commented 5 days ago

The Core PRs for this are ready:

If you like those PRs @regisb and @DawoudSheraz , then I can start asking plugin maintainers to make PRs. Once the plugin PRs and the Edly-internal PRs are ready, we can merge all at once, and then Regis can change the branch names in GitHub.

I'm willing to make that happen before Sumac release, but I'm also willing to wait if it seems like too much change during the release testing phase.

regisb commented 4 days ago

I'm happy with those PRs, thanks for opening them Kyle. But shouldn't they target the "nightly" branches? It's a major breaking change, after all.

If necessary I can make the s/nightly/next/g sed replacements in plugins and push straight to the git repos.

Let's push this change before Sumac.

DawoudSheraz commented 4 days ago

Should we hold on until sumac? The original proposal to do it with Sumac was because upstream branches would be renamed as well. Since they are not renamed yet, we can wait until sumac. We can do this first thing after sumac. I am ok with merging it before too.

regisb commented 1 day ago

I think we should make that change before we release tutor v19.0.0. Otherwise we are going to find ourselves with a big, risky change to merge in a very short time.

kdmccormick commented 16 hours ago

If necessary I can make the s/nightly/next/g sed replacements in plugins and push straight to the git repos.

I would not oppose that!

As far as I can tell, those PRs will simply be documentation updates. The timing of them is not so sensitive.

But shouldn't they target the "nightly" branches? It's a major breaking change, after all.

Right, uhhh, stepping back... it seems that we have seven things to coordinate:

  1. The Sumac release on Dec 09
  2. The big Tutor PR, which affects docs, GH workflows, and the setting of OPENEDX_COMMON_VERSION.
  3. The version-suffix Tutor PR, which just changes tutor_nightly to tutor_next
  4. The core branch renaming in overhangio/tutor GitHub settings, which only a repo admin (not I) can do.
  5. The plugin branch renamings in overhangio/tutor-* GitHub settings, which only a repo admin can do.
  6. The TPI PR, which adds the next index and switches from @nightly branches to @next branches.
  7. The Edly GitLab pipeline updates

No matter how we order these, it seems that there will necessarily be some moments of disruption. Since many of these have to be done by Edly, I can't say what the easiest route forward is, so I leave the decision to you folks. Just let me know what branches my PRs should target and I will do that 😄 Or, feel free to take over those PRs and operate them yourselves if that's easier.