ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master' into 2310-merge

Browse Source
This commit is contained in:
Owain van Brakel
2019-10-30 20:28:52 +01:00
parent b3991f219d ca58d24c7f
commit aa7ad3456d
16 changed files with 211 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/build.yml vendored
View File

@@ -1,6 +1,6 @@
name: OpenOSRS - CI
name: OpenOSRS - CI (PR)
on: [pull_request, push]
on: pull_request
jobs:
pr-lint:
@@ -75,4 +75,16 @@ jobs:
if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS'
uses: hmarr/auto-approve-action@v2.0.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
github-token: "${{ secrets.GITHUB_TOKEN }}"
automerge:
name: Automerge
needs: approve
runs-on: ubuntu-latest
steps:
- name: automerge
uses: pascalgn/automerge-action@f84dd310ea4a19890c70a4ff11ab282a872fb94b
env:
AUTOMERGE: "automated pull request"
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"