fix: set correct committer for gh action merge commit (#8774)

This commit is contained in:
Zach Panzarino
2020-10-08 15:55:36 -04:00
committed by GitHub
parent a18d38ed0d
commit 09d95c2836

View File

@@ -12,12 +12,12 @@ jobs:
with:
fetch-depth: 0
token: ${{ secrets.DEVELOP_PUSH_TOKEN }}
- name: Checkout develop branch
run: git checkout develop
- name: Set committer info
run: |
git config --local user.email "$(git log --format='%ae' HEAD^!)"
git config --local user.name "$(git log --format='%an' HEAD^!)"
- name: Checkout develop branch
run: git checkout develop
- name: Check for merge conflict
id: check-conflict
run: echo "::set-output name=merge_conflict::$(git merge-tree $(git merge-base HEAD master) master HEAD | egrep '<<')"