Fix PHP refresh pipeline merge
See https://github.com/PrivateBin/PrivateBin/pull/847#issuecomment-942580850 Now merging the origin as master is not yet pulled.
This commit is contained in:
parent
0fb104b102
commit
af852927a9
2
.github/workflows/refresh-php8.yml
vendored
2
.github/workflows/refresh-php8.yml
vendored
@ -22,7 +22,7 @@ jobs:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Merge master changes into php8
|
||||
run: git merge master
|
||||
run: git merge origin/master
|
||||
|
||||
- name: Push new changes
|
||||
uses: github-actions-x/commit@v2.8
|
||||
|
Loading…
Reference in New Issue
Block a user