Skip to content

Commit d1fe965

Browse files
authored
Merge pull request #283 from taiki-e/bors
Add GitHub Actions to the merge requirement of bors
2 parents 9c32133 + f8af22f commit d1fe965

File tree

3 files changed

+37
-25
lines changed

3 files changed

+37
-25
lines changed

.github/workflows/ci.yml

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
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:
5-
name: Build and test on ${{ matrix.os }}
12+
name: Build and test
613
runs-on: ${{ matrix.os }}
714
strategy:
815
matrix:
916
os: [ubuntu-latest, windows-latest, macOS-latest]
17+
rust: [nightly]
1018

1119
steps:
1220
- uses: actions/checkout@master
1321

14-
- name: Install nightly
22+
- name: Install ${{ matrix.rust }}
1523
uses: actions-rs/toolchain@v1
1624
with:
17-
toolchain: nightly
25+
toolchain: ${{ matrix.rust }}
1826
override: true
1927

2028
- name: check
@@ -65,3 +73,21 @@ jobs:
6573

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

.github/workflows/clippy.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

bors.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
status = ["continuous-integration/travis-ci/push"]
1+
status = [
2+
"Build and test (ubuntu-latest, nightly)",
3+
"Build and test (windows-latest, nightly)",
4+
"Build and test (macOS-latest, nightly)",
5+
"Checking fmt and docs",
6+
"Clippy check",
7+
]

0 commit comments

Comments
 (0)