From bd1665f6c93daafb0699701f156169e718e613d6 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 16 Apr 2026 19:17:43 +0200 Subject: [PATCH] fix: only enable automerge dependencies on on open / reopen Only enable the automerge when the PR is opened or reopened, but not if e.g. rebased or pushed. This is needed if the PR is known bad and you try to fix it, but in the meantime its automerged, even if you disabled it. Signed-off-by: Ferdinand Thiessen --- workflow-templates/dependabot-approve-merge.yml | 2 +- workflow-templates/renovate-approve-merge.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow-templates/dependabot-approve-merge.yml b/workflow-templates/dependabot-approve-merge.yml index f84397b8..71261f46 100644 --- a/workflow-templates/dependabot-approve-merge.yml +++ b/workflow-templates/dependabot-approve-merge.yml @@ -53,6 +53,6 @@ jobs: # Enable GitHub auto merge - name: Auto merge uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0 - if: startsWith(steps.branchname.outputs.branch, 'dependabot/') + if: startsWith(steps.branchname.outputs.branch, 'dependabot/') && (github.event.pull_request.action == 'opened' || github.event.pull_request.action == 'reopened') with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/workflow-templates/renovate-approve-merge.yml b/workflow-templates/renovate-approve-merge.yml index ccfed397..decbabf2 100644 --- a/workflow-templates/renovate-approve-merge.yml +++ b/workflow-templates/renovate-approve-merge.yml @@ -53,6 +53,6 @@ jobs: # Enable GitHub auto merge - name: Auto merge uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0 - if: startsWith(steps.branchname.outputs.branch, 'renovate/') + if: startsWith(steps.branchname.outputs.branch, 'renovate/') && (github.event.pull_request.action == 'opened' || github.event.pull_request.action == 'reopened') with: github-token: ${{ secrets.GITHUB_TOKEN }}