From 62582b008a0cfc6bc5a9d1f7c64f88a79e170ccc Mon Sep 17 00:00:00 2001
From: Mathis Hofer <hofer@puzzle.ch>
Date: Wed, 13 Sep 2023 11:06:19 +0200
Subject: [PATCH 1/3] Prepare release instructions section

---
 doc/releasing.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/releasing.md b/doc/releasing.md
index ff164e91..a1732a1e 100644
--- a/doc/releasing.md
+++ b/doc/releasing.md
@@ -29,3 +29,7 @@ Production:
 - To release & deploy to the _production_ environment running at Bedag, BKD merges the `test` branch into the `production` branch. The workflow [docker.yml](../.github/workflows/docker.yml) can usually reuse the Docker image already built for this commit and will tag it with the `production` tag. In a Gitops manner, the Bedag cluster will then deploy the `production` Image to the _production_ environment.
 
 - Hotfixes can either be made on the `production` branch (using a hotfix branch if appropriate), then cherry-picked back into the `main` branch. Or they can be made in the `main` branch, then cherry-picked into the `test`/`production` branch.
+
+## Release Instructions
+
+TODO

From c7cdd85545f6aa58a0d19077f87a382fcab029e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20Kreienb=C3=BChl?= <nils.kreienbuehl@protonmail.com>
Date: Fri, 15 Sep 2023 10:56:19 +0200
Subject: [PATCH 2/3] add automerge workflow

---
 .github/workflows/automerge.yml | 30 ++++++++++++++++++++++++++++++
 .github/workflows/docker.yml    |  7 +++++++
 2 files changed, 37 insertions(+)
 create mode 100644 .github/workflows/automerge.yml

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
new file mode 100644
index 00000000..53fa5c1a
--- /dev/null
+++ b/.github/workflows/automerge.yml
@@ -0,0 +1,30 @@
+name: automerge
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - id: automerge
+        name: automerge
+        uses: "pascalgn/automerge-action@v0.15.6"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_LABELS: "automerge, deployment"
+          MERGE_METHOD: "rebase"
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 402d99fb..498c8480 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -22,6 +22,13 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
+  debug:
+    runs-on: ubuntu-latest
+
+    steps:
+      - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
+      - run: echo "🎉 event info ${{ github.event.pull_request }}"
+
   prerequisites:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true

From 3201990c0d3196e384cfe2e23d3779e564fcf066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20Kreienb=C3=BChl?= <nils.kreienbuehl@protonmail.com>
Date: Fri, 15 Sep 2023 15:10:49 +0200
Subject: [PATCH 3/3] use default merge

---
 .github/workflows/automerge.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 53fa5c1a..98f98144 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -26,5 +26,6 @@ jobs:
         uses: "pascalgn/automerge-action@v0.15.6"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          MERGE_LABELS: "automerge, deployment"
-          MERGE_METHOD: "rebase"
+          MERGE_LABELS:
+            "automerge, deployment"
+            #MERGE_METHOD: "rebase"