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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support multiple stable release branches / consider all branches when looking for previous release shas #2203

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

trevorwhitney
Copy link

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:

  • Make sure to open an issue as a bug/issue before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea
  • Ensure the tests and linter pass
  • Code coverage does not decrease (if any source code was changed)
  • Appropriate docs were updated (if necessary)

Fixes #2202 馃

We are currently using this fork for our release process and it appears to be working as expected, but I'm sure there are edge cases that aren't being addressed yet.

This PR add a flag --consider-all-branches that, when specified, will use GitHub's compare commits API to compare the commits between head of the branch being released, and the found sha of the previous release, allowing the previous release's sha to be on a different branch. This allows, for example, to have a branch like release-1.7.x, with the latest release being, say, 1.7.4, and then release a new minor version (1.8.0) from a branch like release-1.8.x, and have it correctly show the changelog of commits since 1.7.4, even though that tag is on a different branch.

This PR isn't complete yet, and there's a lot of test coverage missing, but I wanted to get consensus on the approach before investing more time. Thanks!

@trevorwhitney trevorwhitney requested review from a team as code owners January 26, 2024 20:47
Copy link

google-cla bot commented Jan 26, 2024

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@product-auto-label product-auto-label bot added the size: l Pull request size is large. label Jan 26, 2024
@trevorwhitney trevorwhitney changed the title Multi branch release Support multiple stable release branches / consider all branches when looking for previous release shas Jan 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size: l Pull request size is large.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Consider tags on separate release branches / allow multiple stable release branches
2 participants