aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/bors.toml6
-rw-r--r--.github/workflows/ci.yml33
-rw-r--r--.github/workflows/clippy.yml20
-rw-r--r--.github/workflows/rustfmt.yml23
-rw-r--r--.travis.yml34
5 files changed, 81 insertions, 35 deletions
diff --git a/.github/bors.toml b/.github/bors.toml
index ca42be0..dcf6c13 100644
--- a/.github/bors.toml
+++ b/.github/bors.toml
@@ -1,4 +1,8 @@
block_labels = ["needs-decision"]
delete_merged_branches = true
required_approvals = 1
-status = ["continuous-integration/travis-ci/push"]
+status = [
+ "ci-linux (stable)",
+ "ci-linux (1.38.0)",
+ "rustfmt",
+]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..a03fbf6
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,33 @@
+on:
+ push:
+ branches: [ staging, trying, master ]
+ pull_request:
+
+name: CI
+
+jobs:
+ ci-linux:
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ # All generated code should be running on stable now
+ rust: [stable]
+
+ include:
+ # Test MSRV
+ - rust: 1.38.0
+
+ # Test nightly but don't fail
+ - rust: nightly
+ experimental: true
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions-rs/toolchain@v1
+ with:
+ profile: minimal
+ toolchain: ${{ matrix.rust }}
+ override: true
+ - name: Run tests
+ run: cargo test --all
+
+# FIXME: test on macOS and Windows
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
new file mode 100644
index 0000000..b2ddd51
--- /dev/null
+++ b/.github/workflows/clippy.yml
@@ -0,0 +1,20 @@
+on:
+ push:
+ branches: [ staging, trying, master ]
+ pull_request:
+
+name: Clippy check
+jobs:
+ clippy:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions-rs/toolchain@v1
+ with:
+ profile: minimal
+ toolchain: stable
+ override: true
+ components: clippy
+ - uses: actions-rs/clippy-check@v1
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml
new file mode 100644
index 0000000..bd5997c
--- /dev/null
+++ b/.github/workflows/rustfmt.yml
@@ -0,0 +1,23 @@
+on:
+ push:
+ branches: [ staging, trying, master ]
+ pull_request:
+
+name: Code formatting check
+
+jobs:
+ fmt:
+ name: rustfmt
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions-rs/toolchain@v1
+ with:
+ profile: minimal
+ toolchain: stable
+ override: true
+ components: rustfmt
+ - uses: actions-rs/cargo@v1
+ with:
+ command: fmt
+ args: --all -- --check
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5547b78..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-language: rust
-
-branches:
- only:
- - master
- - staging
- - trying
-
-rust:
- - 1.38.0
- - stable
- - nightly
-
-if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-matrix:
- allow_failures:
- - rust: nightly
-
-before_install: set -e
-
-script:
- - cargo test --all
-
-after_script: set +e
-
-cache: cargo
-
-before_cache:
- - chmod -R a+r $HOME/.cargo;
-
-notifications:
- email:
- on_success: never