diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55c32e744..c6deeb3a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,9 @@ on: pull_request +name: test jobs: - build_and_test: - name: Build and test on ${{ matrix.os }} + check_src: + name: nightly on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: @@ -35,8 +36,8 @@ jobs: command: test args: --all --doc --features unstable - check_fmt_and_docs: - name: Checking fmt and docs + check_docs: + name: rustdoc runs-on: ubuntu-latest steps: - uses: actions/checkout@master @@ -53,15 +54,12 @@ jobs: - name: setup run: | - rustup component add rustfmt test -x $HOME/.cargo/bin/mdbook || ./ci/install-mdbook.sh rustc --version - name: mdbook run: | mdbook build docs - - name: fmt - run: cargo fmt --all -- --check - name: Docs run: cargo doc --features docs,unstable diff --git a/.github/workflows/clippy.yml b/.github/workflows/style.yml similarity index 50% rename from .github/workflows/clippy.yml rename to .github/workflows/style.yml index c26affbf4..75059d051 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/style.yml @@ -1,8 +1,9 @@ on: pull_request -name: Clippy check +name: style jobs: - clippy_check: + clippy: + name: clippy runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 @@ -18,3 +19,21 @@ jobs: - uses: actions-rs/clippy-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} + + fmt: + name: rustfmt + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - id: component + uses: actions-rs/components-nightly@v1 + with: + component: rustfmt + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ steps.component.outputs.toolchain }} + override: true + - name: setup + run: rustup component add rustfmt + - name: fmt + run: cargo fmt --all -- --check diff --git a/bors.toml b/bors.toml index 359f8947b..8dc856aa7 100644 --- a/bors.toml +++ b/bors.toml @@ -1 +1,10 @@ -status = ["continuous-integration/travis-ci/push"] +status = [ + "test (stable)", + "test (beta)", + "test (nightly)", + "test (macos)", + "style (clippy)", + "style (rustfmt)", + "style (rustdoc)", +] +delete_merged_branches = true