Merge pull request #1654 from clap-rs/bors

Bors

.appveyor.yml

@@ -1,3 +1,6 @@
+cache:
+  - '%USERPROFILE%\.cargo'
+  - target
 environment:
   matrix:
     - TARGET: x86_64-pc-windows-msvc
@@ -5,6 +8,15 @@ environment:
     - TARGET: x86_64-pc-windows-gnu
     - TARGET: i686-pc-windows-gnu
   RUST_BACKTRACE: full
+branches:
+  only:
+    # This is where pull requests from "bors r+" are built.
+    - staging
+    # This is where pull requests from "bors try" are built.
+    - trying
+    # Enable building pull requests.
+    - master
+    - v2-master
 install:
   - curl -sSf -o rustup-init.exe https://win.rustup.rs/
   - rustup-init.exe -y --default-host %TARGET%
@@ -15,3 +27,6 @@ build: false
 test_script:
   - cargo test --all --no-default-features
   - cargo test --all --features "yaml unstable"
+notifications:
+  - provider: Email
+    on_build_success: false

.travis.yml

@@ -2,6 +2,15 @@ os: linux
 language: rust
 cache: cargo
 rust: stable
+branches:
+  only:
+    # This is where pull requests from "bors r+" are built.
+    - staging
+    # This is where pull requests from "bors try" are built.
+    - trying
+    # Enable building pull requests.
+    - master
+    - v2-master
 jobs:
   allow_failures:
     - rust: nightly

bors.toml

@@ -0,0 +1,11 @@
+status = [
+	"continuous-integration/travis-ci/push",
+	"continuous-integration/appveyor/branch"
+]
+pr_status = [
+	"continuous-integration/travis-ci/pr",
+	"continuous-integration/appveyor/pr"
+]
+timeout_sec = 7200
+delete_merged_branches = true
+block_lables = ["R: blocked"]