From 8d5cca23659be307d3bf56e2a2df69af0cb7cdc3 Mon Sep 17 00:00:00 2001
From: aesoft <43991222+aeppling@users.noreply.github.com>
Date: Tue, 17 Sep 2024 14:15:02 +0200
Subject: [PATCH] merge dev job

---
 .github/workflows/fullrelease.yaml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/fullrelease.yaml b/.github/workflows/fullrelease.yaml
index c07bdd3..78b0340 100644
--- a/.github/workflows/fullrelease.yaml
+++ b/.github/workflows/fullrelease.yaml
@@ -32,12 +32,36 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
           git add charts/kexa-chart/Chart.yaml
           git commit -m "chore(release): update Chart.yaml version"
+          git push origin main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
+  merge-to-dev:
+    needs: semantic-release
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: main
+
+      - name: Merge main into dev
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git fetch origin dev
+          git checkout dev
+          git merge main --no-edit
           git push origin dev
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   helm-release:
-    needs: semantic-release
+    needs: merge-to-dev
     permissions:
       contents: write
     runs-on: ubuntu-latest