From 94995f5104bdcf9bc1beba30bd5f120ec55cbd97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Pallar=C3=A9s?=
 <cristian.pallares@localstack.cloud>
Date: Wed, 1 Apr 2026 09:59:54 +0200
Subject: [PATCH 1/2] chore(ci): auto-merge release pull requests

---
 .github/workflows/release-auto-merge.yml | 30 ++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/release-auto-merge.yml

diff --git a/.github/workflows/release-auto-merge.yml b/.github/workflows/release-auto-merge.yml
new file mode 100644
index 0000000..dd6cff0
--- /dev/null
+++ b/.github/workflows/release-auto-merge.yml
@@ -0,0 +1,30 @@
+name: Release Auto-merge
+
+on:
+  schedule:
+    - cron: '0 9 * * 1'
+  workflow_dispatch:
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  auto-merge:
+    name: Enable auto-merge on release PRs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Enable auto-merge on localstack-bot PRs
+        env:
+          GH_TOKEN: ${{ secrets.LOCALSTACK_BOT_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+        run: |
+          gh pr list \
+            --author "localstack-bot[bot]" \
+            --state open \
+            --json number \
+            --jq '.[].number' | \
+          while read -r pr; do
+            echo "Enabling auto-merge on PR #$pr"
+            gh pr merge "$pr" --auto --squash
+          done

From bf43d6a139523ca8cf2ee9c781c8a0bd7dcc5976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Pallar=C3=A9s?=
 <cristian.pallares@localstack.cloud>
Date: Wed, 1 Apr 2026 10:24:52 +0200
Subject: [PATCH 2/2] wip

---
 .github/workflows/release-auto-merge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-auto-merge.yml b/.github/workflows/release-auto-merge.yml
index dd6cff0..7edaa52 100644
--- a/.github/workflows/release-auto-merge.yml
+++ b/.github/workflows/release-auto-merge.yml
@@ -14,13 +14,13 @@ jobs:
     name: Enable auto-merge on release PRs
     runs-on: ubuntu-latest
     steps:
-      - name: Enable auto-merge on localstack-bot PRs
+      - name: Enable auto-merge on release PRs
         env:
           GH_TOKEN: ${{ secrets.LOCALSTACK_BOT_TOKEN }}
           GH_REPO: ${{ github.repository }}
         run: |
           gh pr list \
-            --author "localstack-bot[bot]" \
+            --label "autorelease: pending" \
             --state open \
             --json number \
             --jq '.[].number' | \