Skip to content
This repository was archived by the owner on Feb 17, 2021. It is now read-only.

Commit 120f84c

Browse files
author
Thiago C. D'Ávila
authored
Merge pull request #95 from staticdev/upgrade-workflow
Upgrade workflow
2 parents cf6e869 + a828613 commit 120f84c

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/dependabot.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@ name: Dependabot
22

33
on:
44
pull_request:
5-
branches: [master]
5+
branches:
6+
- master
67

78
jobs:
89
automerge:
910
name: Merge Dependabot pull request
1011
runs-on: ubuntu-latest
11-
if: github.base_ref == 'master' && (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
12+
if: github.base_ref == 'master' && github.actor == 'dependabot[bot]'
1213
steps:
13-
- uses: actions/github-script@v1.1
14+
- uses: actions/github-script@v2
1415
with:
15-
github-token: ${{github.token}}
16+
github-token: ${{secrets.GITHUB_TOKEN}}
1617
script: |
17-
github.pullRequests.merge({
18+
github.pulls.merge({
1819
owner: context.repo.owner,
1920
repo: context.repo.repo,
2021
pull_number: context.payload.pull_request.number

0 commit comments

Comments
 (0)