Skip to content

Commit 8772ec6

Browse files
committed
update merge branch action version
1 parent 9c0e6b6 commit 8772ec6

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

.github/workflows/prod-release.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,18 @@ jobs:
2727
run: git config --global user.email "179917785+engineering-ci[bot]@users.noreply.github.com" && git config --global user.name "engineering-ci[bot]"
2828

2929
- name: Merge main -> release
30-
uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f
30+
uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
3131
with:
3232
type: now
3333
from_branch: main
3434
target_branch: release
3535
github_token: ${{ steps.app_token.outputs.token }}
3636

3737
- name: Merge release -> main
38-
uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f
38+
uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
3939
with:
4040
type: now
4141
from_branch: release
4242
target_branch: main
43+
message: 'Merge release back to main to get version increment [no ci]'
4344
github_token: ${{ steps.app_token.outputs.token }}
44-
env:
45-
INPUT_MESSAGE: 'Merge release back to main to get version increment [no ci]'

0 commit comments

Comments
 (0)