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

Release tooling: Fix "picked" labelling #23244

Merged
merged 2 commits into from
Jun 30, 2023
Merged

Conversation

JReinhold
Copy link
Contributor

@JReinhold JReinhold commented Jun 28, 2023

What I did

Removed the --first-parent flag when running git log.

The label patches script works by going through all the commits between HEAD and the latest version release, finding their PRs, and labelling as picked. However currently when running git log --first-parent v7.0.23...HEAD it only gets the merge commit from the release PR:

a1a8aaad0c Merge pull request #23185 from storybookjs/version-patch-from-7.0.23

However when doing the same thing without --first-parent you get the correct commits:

a1a8aaad0c Merge pull request #23185 from storybookjs/version-patch-from-7.0.23
1eec3cd4e4 temporarily skip a test on windows
16bb3e5ed1 upgrade svelte-vite-plugin to 2.4.2
6f6f8d7d8d Merge pull request #23199 from storybookjs/fix/parse-pnp-paths-in-metadata
fa7ec4dccb Merge pull request #23219 from storybookjs/label-merge-as-release
ebfbf2f9f1 Merge pull request #23221 from storybookjs/fix-23200
8ae1fd262a Merge pull request #22905 from storybookjs/svelte-4
3b9f187e73 Bump version from 7.0.23 to 7.0.24
1632fb2188 Merge pull request #22876 from pascalfiv/patch-1
5c9c29e242 Merge pull request #23020 from noviceGuru/next
e36ef13840 Merge pull request #23198 from storybookjs/release-tooling-simpler-ci
1457390361 Merge pull request #23116 from storybookjs/shilman/fix-release-url

How to test

The only way to truly test this is to merge it and see if it works the next time.

I tested it locally by checking out latest-release, and running the script with v7.0.23 tag hardocded, which didn't find any changes. Then I removed --first-parent, and it found all the correct PRs to label.

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

  • If this PR should be tested against many or all sandboxes,
    make sure to add the ci:merged or ci:daily GH label to it.
  • Make sure this PR contains one of the labels below.

["cleanup", "BREAKING CHANGE", "feature request", "bug", "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 labels Jun 28, 2023
@JReinhold JReinhold requested a review from kasperpeulen June 28, 2023 11:14
@JReinhold JReinhold marked this pull request as ready for review June 28, 2023 11:14
Copy link
Contributor

@kasperpeulen kasperpeulen left a comment

Choose a reason for hiding this comment

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

LGTM

@kasperpeulen kasperpeulen merged commit 7375f7a into next Jun 30, 2023
@kasperpeulen kasperpeulen deleted the fix-picked-labelling branch June 30, 2023 11:38
JReinhold pushed a commit that referenced this pull request Jul 2, 2023
Release tooling: Fix "picked" labelling

(cherry picked from commit 7375f7a)
@github-actions github-actions bot mentioned this pull request Jul 2, 2023
15 tasks
@github-actions github-actions bot added the patch:done Patch/release PRs already cherry-picked to main/release branch label Jul 3, 2023
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 patch:done Patch/release PRs already cherry-picked to main/release branch patch:yes Bugfix & documentation PR that need to be picked to main branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants