Release tooling: Fix getting changes from wrong tag #23571
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JReinhold
added
patch:yes
JReinhold
requested review from
ndelangen,
kasperpeulen,
kylegach and
jonniebigodes
as code owners
ndelangen
reviewed
Jul 24, 2023
scripts/release/utils/git-client.ts
Outdated
Comment on lines
6
to
12
| * ensures that prereleases are listed as earlier than stable releases. | ||
| * eg. in the following list, this config correctly puts 7.1.0 on the top instead of the bottom: | ||
| * 7.1.0 | ||
| * 7.1.0-rc.2 | ||
| * 7.1.0-rc.1 | ||
| * See https://stackoverflow.com/a/52680984 | ||
| */ |
There was a problem hiding this comment.
What does it mean to be at the bottom or top of this list, please add a comment, it's not obvious what the effects are from this change.
There was a problem hiding this comment.
Updated it, is this better?
ndelangen
approved these changes
Jul 24, 2023
This was referenced Jul 24, 2023
Merged
JReinhold
added a commit
that referenced
this pull request
Jul 24, 2023
Release tooling: Fix getting changes from wrong tag (cherry picked from commit 950df76)
github-actions
bot
added
the
patch:done
30 tasks
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What I did
Changed the git config slightly when getting changes from the git history. Previously it would list prereleases as later than stable releases, which caused the change calculation to get more changes than actually true. It would think that
7.1.0-rc.2was later than7.1.0, causing it to list the changes for7.2.0-alpha.0to go all the way back to7.1.0-rc.2, even though it only needed to go back to7.1.0.The two Svelte vite changes listed in the changelog for
7.2.0-alpha.0was actually already released in7.1.0, but the faulty change looking included them in7.2.0-alpha.0as well:https://github.com/storybookjs/storybook/pull/23504/files#diff-c39e91bd3d7f02d36f0212bd4dc4958db10059da7ab8c79bbe546a12e8973cd6R4-R5
Also updated
next.jsonmanually as it was forgotten when updatingCHANGELOG.prerelease.mdmanually in7.2.0-alpha.0. (which is okay, because that documentation change isn't merged yet)How to test
Checklist
MIGRATION.MD
Maintainers
ci:normal,ci:mergedorci:dailyGH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found incode/lib/cli/src/sandbox-templates.ts["cleanup", "BREAKING CHANGE", "feature request", "bug", "build", "documentation", "maintenance", "dependencies", "other"]