Skip to content

Commit 0759dd0

Browse files
committed
[no-ci] chore: fix cd process
1 parent 7732445 commit 0759dd0

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/workflows/cicd.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,13 @@ jobs:
145145
GITHUB_TOKEN: ${{ secrets.CUSTOM_GH_TOKEN }}
146146
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
147147
run: npm run release
148+
149+
- name: Merge release -> main
150+
uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
151+
if: github.ref == 'refs/heads/release'
152+
with:
153+
type: now
154+
from_branch: release
155+
target_branch: main
156+
message: Merge release back to main to get version increment [no ci]
157+
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/prod_release.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,3 @@ jobs:
2121
from_branch: main
2222
target_branch: release
2323
github_token: ${{ secrets.GITHUB_TOKEN }}
24-
- name: Merge release -> main
25-
uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
26-
with:
27-
type: now
28-
from_branch: release
29-
target_branch: main
30-
message: Merge release back to main to get version increment [no ci]
31-
github_token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)