Skip to content

build: Don't branch or tag this in the named release#1310

Merged
farhaanbukhsh merged 2 commits intomainfrom
kdmccormick/no-tag
Nov 3, 2025
Merged

build: Don't branch or tag this in the named release#1310
farhaanbukhsh merged 2 commits intomainfrom
kdmccormick/no-tag

Conversation

@kdmccormick
Copy link
Member

@sarina , from https://discuss.openedx.org/t/git-checkout-release-ulmo/17466 :

we don't want a release branch made on the docs repo, because so much documentation happens between the cut and the release and backporting so many docs changes is a big cognitive overhead

Is it fair to then remove this line from catalog-info so that it's not auto-tagged in the future?

we don't want a release branch made on the docs repo, because so much documentation happens between the cut and the release and backporting so many docs changes is a big cognitive overhead
@kdmccormick kdmccormick requested a review from sarina October 30, 2025 19:13
@kdmccormick kdmccormick marked this pull request as draft October 30, 2025 19:14
@kdmccormick
Copy link
Member Author

kdmccormick commented Oct 30, 2025

Ah wait, I realize now that even though we don't want the repo branched (release/ulmo), we do want it tagged (release/ulmo.1, release/ulmo.2, etc.). So, maybe this isn't the right change.

I'll leave this open as a draft for @sarina and @farhaanbukhsh to discuss, but feel free to close if this isn't right.

@sarina
Copy link
Contributor

sarina commented Oct 30, 2025

Yeah, agree that we want this repo to have an Ulmo branch, but in a nonstandard way: that the Ulmo branch is created on the day of the release, instead of the cut. I don't know the best way to do that. Is it perhaps that I would hard-delete the current Ulmo branch and recreate it before the release date?

@farhaanbukhsh
Copy link
Member

farhaanbukhsh commented Oct 31, 2025

@sarina yes lets delete the Ulmo branch and in the release manager doc, we can add the step to manually create release/<tree> when we release release/<tree>.1.

@kdmccormick kdmccormick marked this pull request as ready for review October 31, 2025 14:25
@kdmccormick kdmccormick requested review from farhaanbukhsh and sarina and removed request for sarina October 31, 2025 14:25
@kdmccormick
Copy link
Member Author

sgtm! I added a comment to the catalog-info file, let me know if it looks good.

Copy link
Member

@farhaanbukhsh farhaanbukhsh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 LGTM

  • ✅ I read through the code
  • ❌ I checked for accessibility issues
  • ✅ Includes documentation

@farhaanbukhsh farhaanbukhsh merged commit 7b9f112 into main Nov 3, 2025
2 checks passed
@farhaanbukhsh farhaanbukhsh deleted the kdmccormick/no-tag branch November 3, 2025 11:04
# This is because a lot of documentation happens between the cut date and the X.1 release date;
# rather than backporting all those docs, we'd rather just make the branch late.
# So, we do not delcare a `openedx.org/release:` key here, because that would confuse the release script.
# Instead, the community Release Manager will manually create the `release/X` branch at the right time.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will the release manager ever see this note?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK great, thank you!

Copy link
Member

@farhaanbukhsh farhaanbukhsh Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants