Skip to content

Commit

Permalink
Merge #21
Browse files Browse the repository at this point in the history
21: bors: add appropriate configuration for it. r=cuviper a=huonw

Also, remove homu.

Co-authored-by: Huon Wilson <wilson.huon@gmail.com>
  • Loading branch information
bors[bot] and huonw committed Dec 12, 2018
2 parents d59e71b + 6cafc64 commit 05c76ad
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
22 changes: 15 additions & 7 deletions .travis.yml
Expand Up @@ -6,10 +6,12 @@ matrix:
fast_finish: true

include:
- rust: nightly
- if: NOT type = pull_request
rust: nightly
env: UNSTABLE=1

- rust: nightly
- if: NOT type = pull_request
rust: nightly
services: docker
env: TARGET=i686-unknown-linux-gnu UNSTABLE=1
sudo: required
Expand All @@ -18,11 +20,14 @@ matrix:
packages:
- gcc-multilib

- rust: beta
- if: NOT type = pull_request
rust: beta

- rust: 1.20.0
- if: NOT type = pull_request
rust: 1.20.0

- rust: stable
- if: NOT type = pull_request
rust: stable
services: docker
env: TARGET=mips64-unknown-linux-gnuabi64
sudo: required
Expand Down Expand Up @@ -51,5 +56,8 @@ before_script:
script:
- ./ci/script.sh

notifications:
webhooks: http://huon.me:54856/travis
branches:
only:
- staging
- trying
- master
3 changes: 3 additions & 0 deletions bors.toml
@@ -0,0 +1,3 @@
status = [
"continuous-integration/travis-ci/push"
]

0 comments on commit 05c76ad

Please sign in to comment.