From 829ff8cf9af070280182e6b4a9786039052f6ec2 Mon Sep 17 00:00:00 2001
From: javierzazo <javierzazo@microsoft.com>
Date: Tue, 23 Jun 2026 02:46:31 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20ci:=20fix=20automerge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/automerge.yml       |  2 +-
 .github/workflows/automerge.yml.jinja | 23 -----------------------
 test/test_cookie/test_jinja.py        |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 .github/workflows/automerge.yml.jinja

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index a72ae6f..b6bc54d 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -17,7 +17,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Enable auto-merge for Dependabot PRs
         if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
-        run: gh pr merge --auto --rebase "$PR_URL"
+        run: gh pr merge --auto --squash "$PR_URL"
         env:
           PR_URL: ${{ github.event.pull_request.html_url }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/automerge.yml.jinja b/.github/workflows/automerge.yml.jinja
deleted file mode 100644
index 0047196..0000000
--- a/.github/workflows/automerge.yml.jinja
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Dependabot auto-merge
-on: pull_request
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.user.login == 'dependabot[bot]'
-    steps:
-      - name: Dependabot metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0
-        with:
-          github-token: {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
-      - name: Enable auto-merge for Dependabot PRs
-        if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
-        run: gh pr merge --auto --rebase "$PR_URL"
-        env:
-          PR_URL: {% raw %}${{ github.event.pull_request.html_url }}{% endraw %}
-          GH_TOKEN: {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
diff --git a/test/test_cookie/test_jinja.py b/test/test_cookie/test_jinja.py
index 2690a6d..48a8c05 100644
--- a/test/test_cookie/test_jinja.py
+++ b/test/test_cookie/test_jinja.py
@@ -24,7 +24,6 @@ def environment() -> Environment:
 
 @pytest.fixture(
     params=[
-        ".github/workflows/automerge.yml.jinja",
         ".github/workflows/main.yml.jinja",
         ".github/workflows/pr.yml.jinja",
         ".devcontainer/post-create.sh.jinja",