Skip to content

chore(scripts): handle renamed cherry-pick commits in release script #13395

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
May 29, 2024
Merged

chore(scripts): handle renamed cherry-pick commits in release script #13395

merged 1 commit into from
May 29, 2024

Conversation

mafredri
Copy link
Member

@mafredri mafredri commented May 29, 2024 •
edited
Loading

This came up for the next release:

❯ ./scripts/release/check_commit_metadata.sh v2.11.2 5789ea5397c080058e254e3d7aa895fb5e95ad16
Checking commit metadata for changes between v2.11.2 and 5789ea5397c080058e254e3d7aa895fb5e95ad16...
ERROR: Invariant failed, cherry-picked commits have different titles: chore: generate terraform testdata with matching terraform version (#13343)
 != ci: disable make test-migrations in release.yaml (#13201)

Fix:

Checking commit metadata for changes between v2.11.2 and 5789ea5397c080058e254e3d7aa895fb5e95ad16...
Invariant failed, cherry-picked commits have different titles: chore: generate terraform testdata with matching terraform version (#13343)
 != ci: disable make test-migrations in release.yaml (#13201)
, attempting to check commit body for cherry-pick information...
Not a cherry-pick commit, adding 3364abecdd8bbbf89a82d073d2b405fc623bb174 to pending list...
Invariant failed, cherry-picked commits have different titles: fix: properly detect agent resouces in terraform (#13343)
 != , attempting to check commit body for cherry-pick information...
Found renamed cherry-pick commit 9c5fc3bbbb77a08ebe5cfd5de3bdd4a2e8cbc547 -> 3364abecdd8bbbf89a82d073d2b405fc623bb174
Checking if pending commit 3364abecdd8bbbf89a82d073d2b405fc623bb174 has a corresponding cherry-pick...
Found matching cherry-pick commit 3364abecdd8bbbf89a82d073d2b405fc623bb174 -> 9c5fc3bbbb77a08ebe5cfd5de3bdd4a2e8cbc547

@mafredri mafredri self-assigned this May 29, 2024
@mafredri mafredri requested review from coadler and stirby May 29, 2024 17:53
@mafredri mafredri force-pushed the mafredri/chore-handle-renamed-cherry-picks-in-release-script branch from fa79be2 to 253c2e5 Compare May 29, 2024 17:55
@mafredri mafredri force-pushed the mafredri/chore-handle-renamed-cherry-picks-in-release-script branch from 253c2e5 to ae6db2d Compare May 29, 2024 17:57
stirby
stirby approved these changes May 29, 2024
View reviewed changes
Copy link
Collaborator

@stirby stirby left a comment

Choose a reason for hiding this comment

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

Thank you 👑

@mafredri mafredri merged commit 374f0a0 into main May 29, 2024
30 checks passed
@mafredri mafredri deleted the mafredri/chore-handle-renamed-cherry-picks-in-release-script branch May 29, 2024 18:30
@github-actions github-actions bot locked and limited conversation to collaborators May 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@coadler coadler coadler approved these changes

@stirby stirby stirby approved these changes

Assignees

@mafredri mafredri

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mafredri @coadler @stirby