binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: auto merge workflow fixes

Browse source
This commit is contained in:
sriram veeraghanta 2024-04-29 18:46:50 +05:30
parent 3077cc410e
commit 1c4ca42603
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/auto-merge.yml vendored
View file

@ -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'