Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 }}
20 changes: 0 additions & 20 deletions .github/workflows/clippy.yml

This file was deleted.

8 changes: 7 additions & 1 deletion bors.toml
Original file line number Diff line number Diff line change
@@ -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",
]