Skip to content

Release tooling: Fix getting changes from wrong tag#23571

Merged
JReinhold merged 6 commits into
nextfrom
fix-wrong-latest-tag
Jul 24, 2023
Merged

Release tooling: Fix getting changes from wrong tag#23571
JReinhold merged 6 commits into
nextfrom
fix-wrong-latest-tag

Conversation

@JReinhold
Copy link
Copy Markdown
Contributor

@JReinhold JReinhold commented Jul 24, 2023

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.2 was later than 7.1.0, causing it to list the changes for 7.2.0-alpha.0 to go all the way back to 7.1.0-rc.2, even though it only needed to go back to 7.1.0.

The two Svelte vite changes listed in the changelog for 7.2.0-alpha.0 was actually already released in 7.1.0, but the faulty change looking included them in 7.2.0-alpha.0 as well:

https://github.com/storybookjs/storybook/pull/23504/files#diff-c39e91bd3d7f02d36f0212bd4dc4958db10059da7ab8c79bbe546a12e8973cd6R4-R5


Also updated next.json manually as it was forgotten when updating CHANGELOG.prerelease.md manually in 7.2.0-alpha.0. (which is okay, because that documentation change isn't merged yet)

How to test

Checklist

  • Make sure your changes are tested (stories and/or unit, integration, or end-to-end tests)
  • Make sure to add/update documentation regarding your changes
  • If you are deprecating/removing a feature, make sure to update
    MIGRATION.MD

Maintainers

  • When this PR is ready for testing, make sure to add ci:normal, ci:merged or ci:daily GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in code/lib/cli/src/sandbox-templates.ts
  • Make sure this PR contains one of the labels below.

["cleanup", "BREAKING CHANGE", "feature request", "bug", "build", "documentation", "maintenance", "dependencies", "other"]

@JReinhold JReinhold added patch:yes Bugfix & documentation PR that need to be picked to main branch build Internal-facing build tooling & test updates ci:normal labels Jul 24, 2023
@JReinhold JReinhold marked this pull request as ready for review July 24, 2023 07:36
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
*/
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Updated it, is this better?

@JReinhold JReinhold merged commit 950df76 into next Jul 24, 2023
@JReinhold JReinhold deleted the fix-wrong-latest-tag branch July 24, 2023 09:25
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 github-actions Bot added the patch:done Patch/release PRs already cherry-picked to main/release branch label Jul 24, 2023
@github-actions github-actions Bot mentioned this pull request Jul 26, 2023
30 tasks
@ndelangen ndelangen removed the patch:yes Bugfix & documentation PR that need to be picked to main branch label Oct 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build Internal-facing build tooling & test updates ci:normal patch:done Patch/release PRs already cherry-picked to main/release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants