Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
twinklesharma1311 authored Jul 28, 2021
2 parents 60b87ff + 4b1af0b commit 61800b3
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ updates:
- package-ecosystem: gradle
directory: "/"
schedule:
interval: daily
interval: "daily"
open-pull-requests-limit: 10
33 changes: 33 additions & 0 deletions .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Dependabot automerge
on: pull_request
jobs:
unit-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Clean and Run Unit Tests
uses: eskatos/gradle-command-action@v1
with:
gradle-version: 6.6.1
arguments: clean assemble test
automerge:
name: Rebase dependabot PRs
needs: [unit-tests]
if: ${{github.actor == 'dependabot[bot]' && github.event_name == 'pull_request'}}
runs-on: ubuntu-latest
steps:
- name: Rebase Dependabot PR
uses: actions/github-script@v3
with:
github-token: ${{secrets.PERSONAL_TOKEN}}
script: |
github.pulls.merge({
owner: context.repo.owner,
repo: context.payload.repository.name,
pull_number: context.payload.pull_request.number,
merge_method: 'rebase'
});
4 changes: 1 addition & 3 deletions .github/workflows/unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ on:
push:

jobs:
build:

unit-tests:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
Expand Down

0 comments on commit 61800b3

Please sign in to comment.