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

New version branches are not accurate with non-CI releases #1651

Closed
mattfelten opened this issue Nov 20, 2020 · 2 comments · Fixed by #2175
Closed

New version branches are not accurate with non-CI releases #1651

mattfelten opened this issue Nov 20, 2020 · 2 comments · Fixed by #2175
Labels
bug Something isn't working released This issue/pull request has been released.

Comments

@mattfelten
Copy link

mattfelten commented Nov 20, 2020

Describe the bug
We're running auto manually because we batch PRs into a release. It's a high moving project so we might have 10s of releases a day if it was through CI. Using versionBranch in the config, a new branch is created on a major release. Super cool! But comparing that branch to the corresponding release tag shows a ton of extra changes that should only be in the current release.

To Reproduce

Not using auto in a CI environment. "versionBranches": "release/"

  • Merge multiple PRs to master, one of them being a breaking change (all of these will become v2.0)
  • Manually run auto shipit making a 2.0 release and a new version branch is created (release/1)
  • Compare previous release tag (v1.0) to newly created release branch release/1

The release branch contains the merged PRs that should only be in 2.0

Expected behavior

My guess is that the version branch is created from the state right before the command is run. In our case, we have a handful of PRs that are on master that haven't been released yet waiting to go out in a batch, and all of those get pushed to the new version branch.

I would expect that, since we're already looking back in history at the latest release (v1.0 tag), that tag would be used for content of the version branch instead.

Screenshots

Environment information:

"auto" version: v9.52.0
"git"  version: v2.28.0
"node" version: v12.19.0

Additional context

@mattfelten mattfelten added the bug Something isn't working label Nov 20, 2020
@tl-NASEEBULLAH-AHMADI
Copy link

Can we please get an ETA on this? Thanks 🙏

@intuit-svc
Copy link

🚀 Issue was released in v10.36.5 🚀

@intuit-svc intuit-svc added the released This issue/pull request has been released. label Mar 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working released This issue/pull request has been released.
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants