diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml index 85b8aa1..fbcd9e9 100644 --- a/.github/workflows/auto-merge-dependabot.yml +++ b/.github/workflows/auto-merge-dependabot.yml @@ -25,4 +25,5 @@ jobs: uses: peter-evans/enable-pull-request-automerge@v3 with: token: ${{ secrets.GITHUB_TOKEN }} + pull-request-number: ${{ github.event.pull_request.number }} merge-method: squash diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index cb7cfe2..b9cb4d3 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -32,5 +32,10 @@ jobs: console.log("PR merged successfully."); } catch (error) { + if (error.status === 405 && error.message.includes("Required status check")) { + core.notice(`PR #${pr.number} is approved but required checks are still pending.`); + return; + } + core.setFailed(error.message); }