diff options
author | rugk <[email protected]> | 2021-10-30 16:53:42 +0200 |
---|---|---|
committer | GitHub <[email protected]> | 2021-10-30 16:53:42 +0200 |
commit | 1fff4bf4d7442dccc7cf8ff24dd693354d83ab0a (patch) | |
tree | 4ec59652d61c21624c5c9585fdec359054eda7b1 | |
parent | 20d39347c635e11459cfa0229c62a958ec3366a9 (diff) | |
download | privatebin-1fff4bf4d7442dccc7cf8ff24dd693354d83ab0a.tar.gz privatebin-1fff4bf4d7442dccc7cf8ff24dd693354d83ab0a.tar.bz2 privatebin-1fff4bf4d7442dccc7cf8ff24dd693354d83ab0a.zip |
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.
-rw-r--r-- | .github/workflows/refresh-php8.yml | 7 |
1 files 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/[email protected] 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/[email protected] |