mirror of
https://github.com/cypress-io/cypress.git
synced 2026-03-03 05:19:45 -06:00
fix: set correct committer for gh action merge commit (#8774)
This commit is contained in:
@@ -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 '<<')"
|
||||
|
||||
Reference in New Issue
Block a user