diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8bd9f46..b92e50b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,20 +1,28 @@ -on: pull_request +name: CI + +on: + pull_request: + push: + branches: + - staging + - trying jobs: build_and_test: - name: Build and test on ${{ matrix.os }} + name: Build and test runs-on: ${{ matrix.os }} strategy: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] + rust: [nightly] steps: - uses: actions/checkout@master - - name: Install nightly + - name: Install ${{ matrix.rust }} uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: ${{ matrix.rust }} override: true - name: check @@ -65,3 +73,21 @@ jobs: - name: Docs run: cargo doc --features docs + + clippy_check: + name: Clippy check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - id: component + uses: actions-rs/components-nightly@v1 + with: + component: clippy + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ steps.component.outputs.toolchain }} + override: true + - run: rustup component add clippy + - uses: actions-rs/clippy-check@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml deleted file mode 100644 index c26affbf..00000000 --- a/.github/workflows/clippy.yml +++ /dev/null @@ -1,20 +0,0 @@ -on: pull_request - -name: Clippy check -jobs: - clippy_check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - id: component - uses: actions-rs/components-nightly@v1 - with: - component: clippy - - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ steps.component.outputs.toolchain }} - override: true - - run: rustup component add clippy - - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/bors.toml b/bors.toml index 359f8947..732f8fcf 100644 --- a/bors.toml +++ b/bors.toml @@ -1 +1,7 @@ -status = ["continuous-integration/travis-ci/push"] +status = [ + "Build and test (ubuntu-latest, nightly)", + "Build and test (windows-latest, nightly)", + "Build and test (macOS-latest, nightly)", + "Checking fmt and docs", + "Clippy check", +]