Skip to content

Commit 4aa39cc

Browse files
committed
Add conflict bot
1 parent af5959a commit 4aa39cc

File tree

5 files changed

+19
-282
lines changed

5 files changed

+19
-282
lines changed

.github/workflows/audit-nightly.yml

-12
This file was deleted.

.github/workflows/audit-on-push.yml

-16
This file was deleted.

.github/workflows/ci.yml

-205
This file was deleted.

.github/workflows/conflict.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: PR Conflict Checker
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize]
6+
7+
jobs:
8+
check_pr_conflicts:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Check out code
12+
uses: actions/checkout@v2
13+
14+
- name: Run PR Conflict Checker
15+
uses: depandabot/conflict-bot@v1
16+
with:
17+
github-token: ${{ secrets.CONFLICT_BOT_ACCESS_TOKEN }}
18+
main-branch: main
19+
quiet: true

.github/workflows/lint.yml

-49
This file was deleted.

0 commit comments

Comments
 (0)