File tree Expand file tree Collapse file tree 2 files changed +10
-8
lines changed Expand file tree Collapse file tree 2 files changed +10
-8
lines changed Original file line number Diff line number Diff 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 }}
Original file line number Diff line number Diff line change 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 }}
You can’t perform that action at this time.
0 commit comments