We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent b42677f commit 7189ff6Copy full SHA for 7189ff6
.github/workflows/0-merge-beta.yaml
@@ -21,7 +21,8 @@ jobs:
21
branch: ${{ github.event.inputs.target_branch }}
22
fetch-depth: 1000
23
24
- - shell: bash
+ - name: Merge ${{ github.event.inputs.target_branch }}-beta
25
+ shell: bash
26
env:
27
TARGET_BRANCH: ${{ github.event.inputs.target_branch }}
28
run: |
@@ -36,7 +37,10 @@ jobs:
36
37
git checkout "${MERGE_BRANCH}"
38
fi
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
44
45
# Replace all @v4-beta with @v4 in all action.yaml and all workflows
46
{
0 commit comments