Fix cleanup action for already merged pull requests by perlan · Pull Request #9133 · updatecli/updatecli · GitHub
Skip to content

Fix cleanup action for already merged pull requests - #9133

Merged
olblak merged 4 commits into
updatecli:mainfrom
perlan:client-auto-merge
Jul 4, 2026
Merged

olblak merged 4 commits into
updatecli:mainfrom
perlan:client-auto-merge

Conversation

@perlan

@perlan perlan commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

Fix #9003

This pull request ensure that the CleanAction does not fail if the pull request is auto-merged in CreateAction by using merge.strategy: client in combination with merge.after: 0s.

In my efforts to auto-merge a pull request I tested both auto and client strategies but had no success with either. Looking through the code I actually think that this fix is relevant to auto-merging via server-side merging as well, but I haven't tested that use-case.

Test

There is currently no test provided since the fix is a one-liner and adding a test requires refactoring more code. I did an attempt to create a test case that changes the query struct to a type. If that's fine, I can provide a test-case as well.

Additional Information

Checklist

  • I have updated the documentation via pull request in website repository.

Tradeoff

Potential improvement

@olblak

olblak commented Jun 4, 2026

Copy link
Copy Markdown
Member

@olblak olblak added bug Something isn't working pullrequest-github labels Jun 4, 2026

@olblak olblak left a comment

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.

Thanks for the fix, that's a very good catch and sorry that it took me so long to test it.

@olblak
olblak enabled auto-merge (squash) July 4, 2026 14:24
@olblak
olblak merged commit ba6be27 into updatecli:main Jul 4, 2026
8 checks passed
@perlan

perlan commented Jul 4, 2026

Copy link
Copy Markdown
Contributor Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working pullrequest-github

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Github/pullrequest action using merge.strategy: client with after: 0m — "Pull Request is not mergeable" error in clean stage after successful merge

2 participants