From e03843a9859e77fc01460dc608b75e97576aaed6 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Tue, 1 Oct 2019 20:50:01 +0200 Subject: [PATCH 1/5] actions: Automatically merge PRs from the bot --- .github/workflows/build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2309af56b..16eaeef330 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,5 +74,17 @@ jobs: - name: Approve pull request if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS' uses: hmarr/auto-approve-action@master + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + + merge: + name: Merge + needs: approve + runs-on: ubuntu-latest + + steps: + - name: Merge pull request + if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS' + uses: managedkaos/merge-pull-request@master with: github-token: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file From cdb69f3d4019b4423af4c02cccea680d8f0a9784 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Tue, 1 Oct 2019 20:55:15 +0200 Subject: [PATCH 2/5] actions: Automatically remove merged branches --- .github/workflows/build.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16eaeef330..13299a4787 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,12 +79,24 @@ jobs: merge: name: Merge - needs: approve + needs: [build, test, checkstyle, approve] runs-on: ubuntu-latest steps: - name: Merge pull request if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS' uses: managedkaos/merge-pull-request@master + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + + cleanup: + name: Cleanup + needs: [build, test, checkstyle, approve, merge] + runs-on: ubuntu-latest + + steps: + - name: Remove merged branch + if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS' + uses: jessfraz/branch-cleanup-action@master with: github-token: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file From 7d2d353c8120bc0923e1a0bd52c1be79b3636dcc Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Tue, 1 Oct 2019 21:13:53 +0200 Subject: [PATCH 3/5] actions: No need to run a matrix --- .github/workflows/build.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13299a4787..d84c47e360 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,17 +16,14 @@ jobs: build: runs-on: windows-latest - strategy: - matrix: - java: [ 9, 11, 12 ] - name: Build (Java ${{ matrix.java }}) + name: Build steps: - uses: actions/checkout@master - - name: Set up JDK ${{ matrix.java }} + - name: Set up JDK 11 uses: actions/setup-java@master with: - java-version: ${{ matrix.java }} + java-version: 11 - name: Assembling run: gradlew assemble --console=plain - name: Building @@ -34,17 +31,14 @@ jobs: test: runs-on: windows-latest - strategy: - matrix: - java: [ 9, 11, 12 ] - name: Test (Java ${{ matrix.java }}) + name: Test steps: - uses: actions/checkout@master - name: Set up JDK 11 uses: actions/setup-java@master with: - java-version: ${{ matrix.java }} + java-version: 11 - name: Assembling run: gradlew assemble --console=plain - name: Testing From d83db2b8e44aeb10d84db99a41cde4f3c47e1032 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Wed, 2 Oct 2019 00:35:52 +0200 Subject: [PATCH 4/5] actions: simplify dependencies --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d84c47e360..7a5072467c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: [pull_request, push] jobs: pr-lint: - name: Title linter + name: PR title runs-on: ubuntu-latest steps: @@ -73,7 +73,7 @@ jobs: merge: name: Merge - needs: [build, test, checkstyle, approve] + needs: approve runs-on: ubuntu-latest steps: @@ -85,7 +85,7 @@ jobs: cleanup: name: Cleanup - needs: [build, test, checkstyle, approve, merge] + needs: merge runs-on: ubuntu-latest steps: From 746cb76e2c274b3f1d1a6efcc676694b7b74a70a Mon Sep 17 00:00:00 2001 From: Ganom Date: Thu, 3 Oct 2019 00:13:59 +0000 Subject: [PATCH 5/5] project: Update gradle dependencies --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index a697d93212..111f44a590 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ ext { hamcrest = '2.1' httpcore = '4.4.12' httpmime = '4.5.10' - javassist = '3.25.0-GA' + javassist = '3.26.0-GA' javax = '1.3.2' javaxInject = '1' jbsdiff = '1.0' @@ -68,7 +68,7 @@ ext { mongodbDriverSync = '3.11.0' mysqlConnectorJava = '8.0.17' netty = '4.1.42.Final' - okhttp3 = '4.2.0' + okhttp3 = '4.2.1' orangeExtensions = '1.0' petitparser = '2.2.0' plexus = '3.2.1' @@ -78,7 +78,7 @@ ext { sisu = '0.3.3' slf4j = '1.7.28' springJdbc = '5.2.0.RELEASE' - springboot = '2.1.8.RELEASE' + springboot = '2.1.9.RELEASE' sql2o = '1.6.0' substance = '8.0.02' trident = '1.5.00'