george/PrivateBin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into php8

Browse Source
This commit is contained in:
github-actions[bot]
2021-10-30 15:26:05 +00:00
parent 91462da29d e36a94cfdd
commit 3a801bc238
3 changed files with 63 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/refresh-php8.yml vendored
View File

@@ -12,17 +12,26 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checkout php8 branch
run: git checkout php8
uses: actions/checkout@v2
with:
# directly checkout the php8 branch
ref: php8
# Number of commits to fetch. 0 indicates all history for all branches and tags.
# Default: 1
fetch-depth: 0
- name: Merge master changes into php8
run: git merge 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
with:
name: github-actions[bot]
email: 41898282+github-actions[bot]@users.noreply.github.com
github-token: ${{ secrets.GITHUB_TOKEN }}
push-branch: 'php8'