From 20bbd9311847ab27ced1560db5622e545c16befc Mon Sep 17 00:00:00 2001
From: Endkind <endkind.ender@gmail.com>
Date: Sun, 15 Jun 2025 23:06:02 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84ndere=20Workflow=20zum=20L=C3=B6schen=20v?=
 =?UTF-8?q?on=20zusammengef=C3=BChrten=20Branches,=20um=20auf=20Push-Event?=
 =?UTF-8?q?s=20zu=20reagieren=20und=20die=20Logik=20zur=20Identifizierung?=
 =?UTF-8?q?=20zusammengef=C3=BChrter=20PRs=20zu=20verbessern.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/delete-merged-branch.yml | 28 +++++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/delete-merged-branch.yml b/.github/workflows/delete-merged-branch.yml
index 96181c1..d45e403 100644
--- a/.github/workflows/delete-merged-branch.yml
+++ b/.github/workflows/delete-merged-branch.yml
@@ -1,20 +1,36 @@
 name: Delete merged branch
 
 on:
-  pull_request:
-    types:
-      - closed
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
 
 jobs:
-  delete-branch:
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
+  delete-merged-branch:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Get merged PR
+        id: pr
+        uses: octokit/request-action@v2.x
+        with:
+          route: GET /repos/${{ github.repository }}/commits/${{ github.sha }}/pulls
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Delete merged branch
+        if: steps.pr.outputs.data != '[]'
         run: |
-          branch="${{ github.event.pull_request.head.ref }}"
+          branch=$(echo '${{ steps.pr.outputs.data }}' | jq -r '.[0].head.ref')
           repo="${{ github.repository }}"
           token="${{ secrets.GITHUB_TOKEN }}"
+
+          echo "Deleting branch: $branch"
           if [[ "$branch" != "main" && "$branch" != "master" ]]; then
             curl -s -X DELETE \
               -H "Authorization: Bearer $token" \