Merge #11

11: Enable bors-ng r=taiki-e a=taiki-e Co-authored-by: Taiki Endo <[email protected]>
taiki-e · May 14, 2019 · 8fbdcd3 · 8fbdcd3
2 parents 8ffca06 + ac433e8
commit 8fbdcd3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,12 @@ language: rust
 sudo: false
 cache: cargo
 
+branches:
+  only:
+    - master
+    - staging
+    - trying
+
 matrix:
   fast_finish: true
 
@@ -13,6 +19,9 @@ matrix:
     - rust: stable
     - rust: beta
     - rust: nightly
+      script:
+        - cargo test --no-default-features
+        - cargo test
 
     - rust: nightly
       name: cargo check (minimal versions)
@@ -48,8 +57,8 @@ before_script:
   - set -o errexit
 
 script:
-  - cargo test --no-default-features
-  - cargo test
+  - cargo test --tests --no-default-features
+  - cargo test --tests
 
 notifications:
   email:

diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/pin-project/"
 readme = "README.md"
 keywords = ["pin", "macros", "attribute"]
 categories = ["rust-patterns"]
-exclude = ["/.travis.yml"]
+exclude = ["/.travis.yml", "/bors.toml"]
 
 [badges]
 travis-ci = { repository = "taiki-e/pin-project" }

diff --git a/bors.toml b/bors.toml
@@ -0,0 +1 @@
+status = ["continuous-integration/travis-ci/push"]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		status = ["continuous-integration/travis-ci/push"]