aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEl RIDO <[email protected]>2021-10-30 17:23:23 +0200
committerEl RIDO <[email protected]>2021-10-30 17:23:23 +0200
commite36a94cfdda5205920f4c58fdf05ea29d0bae507 (patch)
treef97d02a65d035bac5fee6767441b0767761fe59f
parent20d39347c635e11459cfa0229c62a958ec3366a9 (diff)
parentb80b318e38f1b6366e0e1c073305e48b927e8625 (diff)
downloadprivatebin-e36a94cfdda5205920f4c58fdf05ea29d0bae507.tar.gz
privatebin-e36a94cfdda5205920f4c58fdf05ea29d0bae507.tar.bz2
privatebin-e36a94cfdda5205920f4c58fdf05ea29d0bae507.zip
Merge branch 'php8-ci-yetagain'
-rw-r--r--.github/workflows/refresh-php8.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/refresh-php8.yml b/.github/workflows/refresh-php8.yml
index 45b6b84c..4c131b40 100644
--- a/.github/workflows/refresh-php8.yml
+++ b/.github/workflows/refresh-php8.yml
@@ -22,8 +22,11 @@ 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]
with: