Skip to content

Commit

Permalink
updated auto-merge-bot to 1.0.1
Browse files Browse the repository at this point in the history
This upgrade contains the change in paritytech/auto-merge-bot#25 which fixes the problem with unstable branches.

## The problem

When the `/merge` command is triggered on a PR that still can't be merge, the bot enables auto-merge.

**But**, when the command is run when the PR is ready to merge, the action will fail to enable auto-merge (this is expected).

We evaluate the error message, and if it says that the PR is clean, it simply merges the PR.

But, we did not handle `unstable` PRs.

An unstable PR is a PR that _can be merged, but a **non required status check is failing**._

So, if a user invoked the `/merge` command on a PR that was ready to merge, but a not-required status check was failing, it would crash.

This upgrade fixes this problem.
  • Loading branch information
Bullrich committed Mar 6, 2024
1 parent 35048df commit 7836dfe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
app_id: ${{ secrets.MERGE_APP_ID }}
private_key: ${{ secrets.MERGE_APP_KEY }}
- name: Set auto merge
uses: paritytech/[email protected].0
uses: paritytech/[email protected].1
with:
GITHUB_TOKEN: ${{ steps.merge_token.outputs.token }}
MERGE_METHOD: "SQUASH"
Expand Down

0 comments on commit 7836dfe

Please sign in to comment.