mirror of
https://github.com/makeplane/plane
synced 2024-06-14 14:31:34 +00:00
fix: auto merge workflow fixes
This commit is contained in:
parent
3077cc410e
commit
1c4ca42603
4
.github/workflows/auto-merge.yml
vendored
4
.github/workflows/auto-merge.yml
vendored
@ -74,10 +74,8 @@ jobs:
|
|||||||
- name: Merge Change to Target Branch
|
- name: Merge Change to Target Branch
|
||||||
if: env.HAS_CONFLICTS == 'false'
|
if: env.HAS_CONFLICTS == 'false'
|
||||||
run: |
|
run: |
|
||||||
git config user.name "$ACCOUNT_USER_NAME"
|
|
||||||
git config user.email "$ACCOUNT_USER_EMAIL"
|
|
||||||
git commit -m "Merge branch '$SOURCE_BRANCH' into $TARGET_BRANCH"
|
git commit -m "Merge branch '$SOURCE_BRANCH' into $TARGET_BRANCH"
|
||||||
git push origin $TARGET_BRANCH
|
git push origin HEAD:$TARGET_BRANCH
|
||||||
|
|
||||||
- name: Create PR to Target Branch
|
- name: Create PR to Target Branch
|
||||||
if: env.HAS_CONFLICTS == 'true'
|
if: env.HAS_CONFLICTS == 'true'
|
||||||
|
Loading…
Reference in New Issue
Block a user