From 7836dfe7450216922d601557d608e5c358b2bf00 Mon Sep 17 00:00:00 2001 From: Javier Bullrich Date: Wed, 6 Mar 2024 16:02:15 +0100 Subject: [PATCH] updated auto-merge-bot to 1.0.1 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. --- .github/workflows/auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 32cb12fb49..9329c6a210 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -22,7 +22,7 @@ jobs: app_id: ${{ secrets.MERGE_APP_ID }} private_key: ${{ secrets.MERGE_APP_KEY }} - name: Set auto merge - uses: paritytech/auto-merge-bot@v1.0.0 + uses: paritytech/auto-merge-bot@v1.0.1 with: GITHUB_TOKEN: ${{ steps.merge_token.outputs.token }} MERGE_METHOD: "SQUASH"