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

Allow commit hash to not be known when finding merge queue PR number #929

Merged
merged 7 commits into from
Mar 5, 2024

Conversation

adrianbruntonsagecom
Copy link
Contributor

Amends change made to v10.0.0 with PR #863 to allow GitHub merge queue branches to be matched when they are using the "squash and merge" merge method. Currently, the branch name is expected to contain a known commit hash, but given commits can be squashed, the commit hash may not be known.

This change therefore loosens the branch name regex match to only check for a known pattern rather than assuming to find a specific commit hash within it. Once it finds the PR number, it can then find the original branch name as it is doing currently.

Fixes #871

@adrianbruntonsagecom adrianbruntonsagecom changed the title Fix merge queue Allow commit hash to not be known when finding merge queue PR number Feb 23, 2024
Copy link
Contributor

@JonathanKolnik JonathanKolnik left a comment

Choose a reason for hiding this comment

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

That makes a lot of sense, thank you @adrianbruntonsagecom!

@JonathanKolnik JonathanKolnik added release Auto: Create a `latest` release when merged patch Auto: Increment the patch version when merged labels Mar 5, 2024
@JonathanKolnik JonathanKolnik enabled auto-merge March 5, 2024 12:44
@JonathanKolnik JonathanKolnik disabled auto-merge March 5, 2024 12:49
@JonathanKolnik JonathanKolnik added this pull request to the merge queue Mar 5, 2024
Merged via the queue into chromaui:main with commit 961843c Mar 5, 2024
23 of 30 checks passed
@ghengeveld
Copy link
Member

🚀 PR was released in v11.0.1 🚀

@ghengeveld ghengeveld added the released Verdict: This issue/pull request has been released label Mar 5, 2024
@adrianbruntonsagecom adrianbruntonsagecom deleted the fix-merge-queue branch March 6, 2024 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
patch Auto: Increment the patch version when merged release Auto: Create a `latest` release when merged released Verdict: This issue/pull request has been released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

chromaui/action UI Review hangs when it is a mandatory check with github merge queue enabled
3 participants