[no-ci] chore: fix cd process

subtopia-algo · Aug 28, 2024 · 0759dd0 · 0759dd0
1 parent 7732445
commit 0759dd0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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 }}