From 0759dd08494924a1ad182231b0b306f08c0447eb Mon Sep 17 00:00:00 2001
From: Altynbek Orumbayev <aorumbayev@protonmail.com>
Date: Thu, 29 Aug 2024 01:19:05 +0300
Subject: [PATCH] [no-ci] chore: fix cd process

---
 .github/workflows/cicd.yaml         | 10 ++++++++++
 .github/workflows/prod_release.yaml |  8 --------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
index 4c6487f..665289b 100644
--- a/.github/workflows/cicd.yaml
+++ b/.github/workflows/cicd.yaml
@@ -145,3 +145,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.CUSTOM_GH_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npm run release
+
+      - name: Merge release -> main
+        uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
+        if: github.ref == 'refs/heads/release'
+        with:
+          type: now
+          from_branch: release
+          target_branch: main
+          message: Merge release back to main to get version increment [no ci]
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/prod_release.yaml b/.github/workflows/prod_release.yaml
index f793f08..2115fbb 100644
--- a/.github/workflows/prod_release.yaml
+++ b/.github/workflows/prod_release.yaml
@@ -21,11 +21,3 @@ jobs:
           from_branch: main
           target_branch: release
           github_token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Merge release -> main
-        uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
-        with:
-          type: now
-          from_branch: release
-          target_branch: main
-          message: Merge release back to main to get version increment [no ci]
-          github_token: ${{ secrets.GITHUB_TOKEN }}