From 1fff4bf4d7442dccc7cf8ff24dd693354d83ab0a Mon Sep 17 00:00:00 2001 From: rugk Date: Sat, 30 Oct 2021 16:53:42 +0200 Subject: [PATCH] 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. --- .github/workflows/refresh-php8.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/refresh-php8.yml b/.github/workflows/refresh-php8.yml index 45b6b84c..04e4297e 100644 --- a/.github/workflows/refresh-php8.yml +++ b/.github/workflows/refresh-php8.yml @@ -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