From 5dabe7011f7b6ce1cdbcf981dfc37b21389042a4 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 11:12:02 +0200
Subject: [PATCH 01/19] Add enable auto merge workflow

---
 .github/workflows/auto-merge.yaml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .github/workflows/auto-merge.yaml

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
new file mode 100644
index 000000000..5af8531cd
--- /dev/null
+++ b/.github/workflows/auto-merge.yaml
@@ -0,0 +1,21 @@
+name: Enable auto merge
+
+on:
+  pull_request:
+    branches: [main, sm-integration]
+    types:
+    - opened
+    - reopened
+    - ready_for_review
+    - synchronize
+
+jobs:
+  enable-auto-merge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Enable auto-merge for PRs
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        run: gh pr merge --auto --squash "$PR_URL"
+        
\ No newline at end of file

From ea840159ba638af60edfd9d803456ebff23ae270 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 11:12:26 +0200
Subject: [PATCH 02/19] Add enable auto merge workflow

---
 .github/workflows/auto-merge.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index 5af8531cd..125ef9807 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -18,4 +18,3 @@ jobs:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
         run: gh pr merge --auto --squash "$PR_URL"
-        
\ No newline at end of file

From 77826849952d8aea499adde053cb5c8f1a2f564e Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 11:17:06 +0200
Subject: [PATCH 03/19] Change token

---
 .github/workflows/auto-merge.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index 125ef9807..d51872626 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -16,5 +16,5 @@ jobs:
       - name: Enable auto-merge for PRs
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
-          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          GH_TOKEN: ${{ secrets.BOT_TOKEN }}
         run: gh pr merge --auto --squash "$PR_URL"

From ea2b566552d0b9d6e3f02cee754c51729ab950ca Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 11:18:19 +0200
Subject: [PATCH 04/19] Change token

---
 .github/workflows/auto-merge.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index d51872626..7db633448 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -16,5 +16,5 @@ jobs:
       - name: Enable auto-merge for PRs
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
-          GH_TOKEN: ${{ secrets.BOT_TOKEN }}
+          GH_TOKEN: ${{secrets.BOT_TOKEN}}
         run: gh pr merge --auto --squash "$PR_URL"

From 1d59571d6628958dcdd5fe0977cad4c7e702ec04 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 11:19:54 +0200
Subject: [PATCH 05/19] Set username

---
 .github/workflows/auto-merge.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index 7db633448..f2be55c83 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -1,5 +1,8 @@
 name: Enable auto merge
 
+env:
+  GIT_NAME: kyma-gopher-bot
+
 on:
   pull_request:
     branches: [main, sm-integration]
@@ -17,4 +20,4 @@ jobs:
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.BOT_TOKEN}}
-        run: gh pr merge --auto --squash "$PR_URL"
+        run: gh pr merge -A ${{ env.GIT_NAME }} --auto --squash "$PR_URL"

From 33bc54bda58854dbf1f48ed57c6027970916e9b9 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 11:28:43 +0200
Subject: [PATCH 06/19] Set mail

---
 .github/workflows/auto-merge.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index f2be55c83..ba41f633e 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -1,6 +1,7 @@
 name: Enable auto merge
 
 env:
+  GIT_EMAIL: team-gopher+1@sap.com
   GIT_NAME: kyma-gopher-bot
 
 on:

From 55a2d75ecc25ecfd37be64ca8d6cba78f715049b Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 11:32:30 +0200
Subject: [PATCH 07/19] Set env

---
 .github/workflows/auto-merge.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index ba41f633e..3f3331c81 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -3,6 +3,7 @@ name: Enable auto merge
 env:
   GIT_EMAIL: team-gopher+1@sap.com
   GIT_NAME: kyma-gopher-bot
+  GH_TOKEN: ${{ secrets.BOT_TOKEN }}
 
 on:
   pull_request:

From 70dd689dbc8f0c9f2b0da4e207a4c21a68f33955 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 11:34:30 +0200
Subject: [PATCH 08/19] Set env

---
 .github/workflows/auto-merge.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index 3f3331c81..d94fd88b2 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -22,4 +22,6 @@ jobs:
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.BOT_TOKEN}}
-        run: gh pr merge -A ${{ env.GIT_NAME }} --auto --squash "$PR_URL"
+        run: |
+            gh auth login --with-token
+            gh pr merge -A ${{ env.GIT_NAME }} --auto --squash "$PR_URL"

From a288a5e0d3091a0634be0c17c54e4808b5f8e20d Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 11:35:32 +0200
Subject: [PATCH 09/19] Set env

---
 .github/workflows/auto-merge.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index d94fd88b2..d904043a4 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -19,9 +19,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Enable auto-merge for PRs
+        run: gh pr merge -A ${{ env.GIT_NAME }} --auto --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.BOT_TOKEN}}
-        run: |
-            gh auth login --with-token
-            gh pr merge -A ${{ env.GIT_NAME }} --auto --squash "$PR_URL"
+        

From 6f7950c8f100637f7ed712c1560faab4f5de7a03 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 11:38:13 +0200
Subject: [PATCH 10/19] Set env

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

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index d904043a4..1ef81f32b 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -21,6 +21,8 @@ jobs:
       - name: Enable auto-merge for PRs
         run: gh pr merge -A ${{ env.GIT_NAME }} --auto --squash "$PR_URL"
         env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GH_TOKEN: ${{secrets.BOT_TOKEN}}
+            PR_URL: ${{github.event.pull_request.html_url}}
+            GH_TOKEN: ${{secrets.BOT_TOKEN}}
+            GIT_EMAIL: team-gopher+1@sap.com
+            GIT_NAME: kyma-gopher-bot
         

From d86af0d6f09601a7040cbb445af0a55f610793c2 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 12:00:27 +0200
Subject: [PATCH 11/19] Revert to github token

---
 .github/workflows/auto-merge.yaml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index 1ef81f32b..4f9eaf706 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -1,10 +1,5 @@
 name: Enable auto merge
 
-env:
-  GIT_EMAIL: team-gopher+1@sap.com
-  GIT_NAME: kyma-gopher-bot
-  GH_TOKEN: ${{ secrets.BOT_TOKEN }}
-
 on:
   pull_request:
     branches: [main, sm-integration]
@@ -19,10 +14,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Enable auto-merge for PRs
-        run: gh pr merge -A ${{ env.GIT_NAME }} --auto --squash "$PR_URL"
         env:
-            PR_URL: ${{github.event.pull_request.html_url}}
-            GH_TOKEN: ${{secrets.BOT_TOKEN}}
-            GIT_EMAIL: team-gopher+1@sap.com
-            GIT_NAME: kyma-gopher-bot
-        
+          GH_TOKEN: ${{ github.token }}
+        run: gh pr merge -A ${{ env.GIT_NAME }} --auto --squash "$PR_URL"

From aed56f6c6f07878c16e4204d935369d084ef3a80 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 12:01:19 +0200
Subject: [PATCH 12/19] Revert to github token

---
 .github/workflows/auto-merge.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index 4f9eaf706..3c5485073 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -16,4 +16,4 @@ jobs:
       - name: Enable auto-merge for PRs
         env:
           GH_TOKEN: ${{ github.token }}
-        run: gh pr merge -A ${{ env.GIT_NAME }} --auto --squash "$PR_URL"
+        run: gh pr merge --auto --squash "$PR_URL"

From c1490e133388fce2f07a3371d414228f3ae160e7 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 12:02:35 +0200
Subject: [PATCH 13/19] Revert to github token

---
 .github/workflows/auto-merge.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index 3c5485073..a396d0708 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -1,5 +1,4 @@
 name: Enable auto merge
-
 on:
   pull_request:
     branches: [main, sm-integration]
@@ -8,12 +7,12 @@ on:
     - reopened
     - ready_for_review
     - synchronize
-
 jobs:
   enable-auto-merge:
     runs-on: ubuntu-latest
     steps:
       - name: Enable auto-merge for PRs
         env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh pr merge --auto --squash "$PR_URL"
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        run: gh pr merge --auto --squash "$PR_URL"
\ No newline at end of file

From 2f4939a936a98e5e7e6869226107950c394e6944 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 12:14:00 +0200
Subject: [PATCH 14/19] Change permissions

---
 .github/workflows/auto-merge.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index a396d0708..877d963c7 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -10,6 +10,9 @@ on:
 jobs:
   enable-auto-merge:
     runs-on: ubuntu-latest
+    permissions: 
+      contents: write
+      pull-requests: write
     steps:
       - name: Enable auto-merge for PRs
         env:

From abfe2ba6d8025ac0ff5a6eafd21e995476bb0ff9 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 12:15:12 +0200
Subject: [PATCH 15/19] Revert to github token

---
 .github/workflows/auto-merge.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index 877d963c7..09d4be8e1 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -7,12 +7,14 @@ on:
     - reopened
     - ready_for_review
     - synchronize
+
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   enable-auto-merge:
     runs-on: ubuntu-latest
-    permissions: 
-      contents: write
-      pull-requests: write
     steps:
       - name: Enable auto-merge for PRs
         env:

From b48486600f549c72f00477a462237bca12e1c589 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 12:53:34 +0200
Subject: [PATCH 16/19] Change permissions

---
 .github/workflows/auto-merge.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index 09d4be8e1..ef11ceef4 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -8,13 +8,14 @@ on:
     - ready_for_review
     - synchronize
 
-permissions:
-  contents: write
-  pull-requests: write
+
 
 jobs:
   enable-auto-merge:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - name: Enable auto-merge for PRs
         env:

From 46002a22147f508bde30176223cf1341c545cd52 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 12:57:54 +0200
Subject: [PATCH 17/19] Fix indentation

---
 .github/workflows/auto-merge.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index ef11ceef4..8497805ab 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -8,8 +8,6 @@ on:
     - ready_for_review
     - synchronize
 
-
-
 jobs:
   enable-auto-merge:
     runs-on: ubuntu-latest

From d7a0e3255dac36123ec972d7e58763bde23b19c3 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 13:58:33 +0200
Subject: [PATCH 18/19] Change to pull request target

---
 .github/workflows/auto-merge.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index 8497805ab..1a99b35bc 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -1,6 +1,6 @@
 name: Enable auto merge
 on:
-  pull_request:
+  pull_request_target:
     branches: [main, sm-integration]
     types:
     - opened
@@ -18,5 +18,6 @@ jobs:
       - name: Enable auto-merge for PRs
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
-          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        run: gh pr merge --auto --squash "$PR_URL"
\ No newline at end of file
+          GH_TOKEN: ${{secrets.BOT_TOKEN}}
+          GIT_NAME: kyma-gopher-bot
+        run: gh pr merge -A ${{ env.GIT_NAME }} --auto --squash "$PR_URL"
\ No newline at end of file

From 6087776a193109bdb17b7b36b9d79078012ff7f8 Mon Sep 17 00:00:00 2001
From: Marek Michali <marek.michali@sap.com>
Date: Thu, 19 Sep 2024 14:00:52 +0200
Subject: [PATCH 19/19] Remove permissions

---
 .github/workflows/auto-merge.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index 1a99b35bc..2c869652e 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -11,9 +11,6 @@ on:
 jobs:
   enable-auto-merge:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
     steps:
       - name: Enable auto-merge for PRs
         env: