From e6b3d70caf703b38d4d9d0f8ae7944421f410781 Mon Sep 17 00:00:00 2001 From: CIS Guru Date: Sun, 14 Dec 2025 14:55:58 -0600 Subject: [PATCH] ci: disable external auto-merge action --- .github/workflows/auto-merge-on-approval.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/auto-merge-on-approval.yml b/.github/workflows/auto-merge-on-approval.yml index 7d77f6b..21dd7ec 100644 --- a/.github/workflows/auto-merge-on-approval.yml +++ b/.github/workflows/auto-merge-on-approval.yml @@ -12,11 +12,7 @@ jobs: contents: write checks: read steps: - - name: Attempt merge when approved - uses: peter-evans/merge-pull-request@v3 - with: - pull-request-number: ${{ github.event.pull_request.number }} - merge-method: merge - commit-title: "Auto-merge PR #${{ github.event.pull_request.number }}" - delete-branch: false - token: ${{ secrets.GITHUB_TOKEN }} + - name: Auto-merge disabled + run: | + echo "Auto-merge on approval disabled." + echo "Please merge the PR manually after required checks and approvals pass."