Skip to content
This repository has been archived by the owner on Jan 8, 2023. It is now read-only.

Commit

Permalink
🐛 fix: 修正自动合并 ci 的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
arvinxx committed Feb 15, 2021
1 parent c178123 commit ff8ea9c
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on:
types: [labeled, edited]

jobs:
merge:
check:
if: contains(github.event.pull_request.labels.*.name, 'dependencies')
name: Dependabot Auto Merge
runs-on: ubuntu-latest
name: Code Quilty Check
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- name: Setup Node.js environment
Expand All @@ -24,8 +24,16 @@ jobs:
**/node_modules
key: npm-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
- run: yarn
- uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
command: merge
target: minor
github-token: ${{ secrets.GH_TOKEN }}
- run: yarn build

merge:
if: contains(github.event.pull_request.labels.*.name, 'dependencies')
need: check
name: Dependabot Auto Merge
runs-on: ubuntu-latest
steps:
- uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
command: merge
target: minor
github-token: ${{ secrets.GH_TOKEN }}

0 comments on commit ff8ea9c

Please sign in to comment.