From 4dd2d3330b5062193cb5e886fc661ea75955be36 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Tue, 26 Dec 2023 21:49:48 +0100
Subject: [PATCH] Enable automerge to release branch on release

---
 .github/workflows/release.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d66f9cc..5fb56a0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,6 +10,18 @@ env:
   GO_VERSION: '1.20'
 
 jobs:
+  merge_release:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Merge development -> staging
+      uses: devmasx/merge-branch@master
+      with:
+        type: now
+        from_branch: main
+        target_branch: release
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+
   build_linux:
     runs-on: ubuntu-latest
     steps: