8000 Document releasing off `*-stable` branches by ashmaroli · Pull Request #8984 · jekyll/jekyll · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Document releasing off *-stable branches #8984

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

Merged
merged 1 commit into from
Mar 4, 2022

Conversation

ashmaroli
Copy link
Member
  • This is a 🔦 documentation change.

Summary

Document the various steps maintainers need to follow to ship releases of *-stable branches.

Context

Based on latest experience from shipping v4.2.2
Closes #8825 (prior art by @parkr)

@ashmaroli ashmaroli requested review from mattr- and parkr March 3, 2022 14:03
@ashmaroli
Copy link
Member Author

@parkr Since you'll be overseeing the release(s) from our 3.9-stable branch, let me know if I missed anything or if we could optimize the overall task.

Copy link
Member
@parkr parkr left a comment

Choose a reason for hiding this comment

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

LGTM!

primarily in reverse chronological order and secondarily scoped to the semver-major-version. For example, a release section for `v3.9.2`
will be listed above the section for `v3.9.1` but under release sections for v4.x.
The snippet stashed earlier has to be injected into the correct location manually.
3. Optionally, update `VERSION` string in `lib/jekyll/version.rb`. (*If existing version is lesser than latest version*).
Copy link
Member

Choose a reason for hiding this comment

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

When would this be the case? When we branch off for a major release and we have release candidates on master and a stable branch for the latest minor release from the previous major release? E.g. 4.0.0.rc1 is on master so we're releasing from 3.9-stable but we want the Jekyll website to reflect a stable (non-RC) version?

Copy link
Member Author

Choose a reason for hiding this comment

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

When would this be the case?

It happens when we're patching mainstream series. In fact, it happens right now, actually.

The current master contains commits deemed to bump the minor version. Understandably, we cut patches for the 4.2.x series from the 4.2-stable branch (even though 4.2.x is the current mainstream series).
However, once 4.2-stable advances to v4.2.2 or v4.2.3, master cannot remain at (older / lesser than) v4.2.1 since jekyllrb.com is deployed off the master.
So, we have to update the version.rb on master as well in a consecutive step.

But, if we were cutting a release for an older series, say, 3.9.x or even 4.1.x, then version.rb on master doesn't reed to be updated.

## Publish GitHub Release

Unlike releases cut off the `master` branch, our JekyllBot does not automatically create and publish a GitHub Release for tags created from
*non-default* branches. Therefore, the maintainer has to **manually create and publish** the concerned GitHub Release.
Copy link
Member

Choose a reason for hiding this comment

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

I'd be happy to see us use jekyllbot for releases off these stable branches, including autogenerating GitHub Releases and shipping to RubyGems.

Copy link
Member Author

Choose a reason for hiding this comment

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

You're more familiar with JekyllBot's codebase than I am. So, you're better positioned to deploy a patch quicker than from a collaborator.

@ashmaroli
Copy link
Member Author

@jekyllbot: merge +doc

@jekyllbot jekyllbot merged commit 36cbca0 into jekyll:master Mar 4, 2022
@ashmaroli ashmaroli deleted the document-releasing-off-stable branch March 4, 2022 16:06
jekyllbot added a commit that referenced this pull request Mar 4, 2022
github-actions bot pushed a commit that referenced this pull request Mar 4, 2022
Ashwin Maroli: Document releasing off `*-stable` branches (#8984)

Merge pull request 8984
@jekyll jekyll locked and limited conversation to collaborators Mar 4, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants
0