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

This commit is contained in:
Ben Thomson 2019-12-29 00:05:19 +08:00
commit e2fe9ed7c8
No known key found for this signature in database
GPG Key ID: B2BAFACC5ED68F87

View File

@ -14,16 +14,8 @@ jobs:
- name: Alert submitter
run: |
export ISSUE_NUMBER=$(echo '${{ github.ref }}' | cut -d'/' -f3)
curl -s --request POST \
--url https://api.github.com/repos/${{ github.repository }}/issues/${ISSUE_NUMBER}/comments \
--header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
--header 'content-type: application/json' \
--data '{"body": "This pull request has been made to the wrong branch. Please review [the contributing guidelines](https://github.com/octobercms/october/blob/master/.github/CONTRIBUTING.md#making-a-pull-request) as all PRs need to be made to the `develop` branch.\n\nWe'\''ll fix it for you this time, but please ensure you make any future PRs to the `develop` branch, not the `master` branch."}' > /dev/null
curl -s --request POST --url https://api.github.com/repos/${{ github.repository }}/issues/${ISSUE_NUMBER}/comments --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' --header 'content-type: application/json' --data '{"body": "This pull request has been made to the wrong branch. Please review [the contributing guidelines](https://github.com/octobercms/october/blob/master/.github/CONTRIBUTING.md#making-a-pull-request) as all PRs need to be made to the `develop` branch.\n\nWe'\''ll fix it for you this time, but please ensure you make any future PRs to the `develop` branch, not the `master` branch."}' > /dev/null
- name: Change base branch
run: |
export ISSUE_NUMBER=$(echo '${{ github.ref }}' | cut -d'/' -f3)
curl -s --request PATCH \
--url https://api.github.com/repos/${{ github.repository }}/pulls/${ISSUE_NUMBER} \
--header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
--header 'content-type: application/json' \
--data '{"base": "develop"}' > /dev/null
curl -s --request PATCH --url https://api.github.com/repos/${{ github.repository }}/pulls/${ISSUE_NUMBER} --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' --header 'content-type: application/json' --data '{"base": "develop"}' > /dev/null