Skip to content

Commit d9d59dc

Browse files
committed
Add GitHub Actions to the merge requirement of bors
1 parent c3e3815 commit d9d59dc

File tree

3 files changed

+36
-22
lines changed

3 files changed

+36
-22
lines changed

.github/workflows/ci.yml

+26-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
on: pull_request
1+
name: CI
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- staging
8+
- trying
29

310
jobs:
411
build_and_test:
@@ -65,3 +72,21 @@ jobs:
6572

6673
- name: Docs
6774
run: cargo doc --features docs
75+
76+
clippy_check:
77+
name: Clippy check
78+
runs-on: ubuntu-latest
79+
steps:
80+
- uses: actions/checkout@v1
81+
- id: component
82+
uses: actions-rs/components-nightly@v1
83+
with:
84+
component: clippy
85+
- uses: actions-rs/toolchain@v1
86+
with:
87+
toolchain: ${{ steps.component.outputs.toolchain }}
88+
override: true
89+
- run: rustup component add clippy
90+
- uses: actions-rs/clippy-check@v1
91+
with:
92+
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/clippy.yml

-20
This file was deleted.

bors.toml

+10-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1-
status = ["continuous-integration/travis-ci/push"]
1+
status = [
2+
# Travis CI
3+
"continuous-integration/travis-ci/push",
4+
# GitHub Actions
5+
"Build and test on ubuntu-latest",
6+
"Build and test on windows-latest",
7+
"Build and test on macOS-latest",
8+
"Checking fmt and docs",
9+
"Clippy check",
10+
]

0 commit comments

Comments
 (0)