Skip to content

Commit 7189ff6

Browse files
committed
update merge-beta script
1 parent b42677f commit 7189ff6

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

.github/workflows/0-merge-beta.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
branch: ${{ github.event.inputs.target_branch }}
2222
fetch-depth: 1000
2323

24-
- shell: bash
24+
- name: Merge ${{ github.event.inputs.target_branch }}-beta
25+
shell: bash
2526
env:
2627
TARGET_BRANCH: ${{ github.event.inputs.target_branch }}
2728
run: |
@@ -36,7 +37,10 @@ jobs:
3637
git checkout "${MERGE_BRANCH}"
3738
fi
3839
39-
git merge --no-edit "${TARGET_BRANCH}-beta" --strategy-option theirs
40+
git merge \
41+
--message "Merge ${TARGET_BRANCH}-beta into ${TARGET_BRANCH}" \
42+
"origin/${TARGET_BRANCH}-beta" \
43+
--strategy-option theirs
4044
4145
# Replace all @v4-beta with @v4 in all action.yaml and all workflows
4246
{

0 commit comments

Comments
 (0)