Also set author for merge commit

Follow-up of 41898282+github-actions[bot]@users.noreply.github.com again

In contrast to your suggestion, @elrido, I did use GitHubs bot account again. The mails won't spam anyone, and it's actually intended for such stuff.
Also, we get a proper avatar on GitHub's commit messages etc., and of course we know it is actually GitHubs (servers) that do this change.
pull/855/head
rugk 2021-10-30 16:53:42 +02:00 committed by GitHub
parent 20d39347c6
commit 1fff4bf4d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions

View File

@ -11,7 +11,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
steps:
- name: Checkout php8 branch
uses: actions/checkout@v2
with:
@ -22,7 +22,10 @@ jobs:
fetch-depth: 0
- name: Merge master changes into php8
run: git merge origin/master
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git merge origin/master
- name: Push new changes
uses: github-actions-x/commit@v2.8