diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-10-11 09:17:25 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-10-11 09:17:25 -0600 |
| commit | 9c1cb9f61e3d7a34fa49355d28d9edc236c0690f (patch) | |
| tree | 7ba071635755d13523dd6c9b026f8f57b83e3462 | |
| parent | 7b904ef6fb2147841366b4adf07327bc1cdbb1be (diff) | |
| parent | 1aed8503b0ac54bc195c1e52ff35154ff01ed7ee (diff) | |
| download | servo-9c1cb9f61e3d7a34fa49355d28d9edc236c0690f.tar.gz servo-9c1cb9f61e3d7a34fa49355d28d9edc236c0690f.zip | |
Auto merge of #7974 - frewsxcv:travis, r=jdm
Use Travis container-based infra for test-tidy
I wasn't aware one could specify options like `sudo` and `services` on a per build-environment basis. Since the container-based builds are faster than normal builds, we should utilize it for test-tidy
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7974)
<!-- Reviewable:end -->
| -rw-r--r-- | .travis.yml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index f3e65d62125..d8179c9a525 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,4 @@ language: python -sudo: 9000 -services: - - docker before_install: - if [ "$DOCKER" = "1" ]; then docker build -t servo etc/ci/; fi @@ -13,12 +10,16 @@ script: matrix: fast_finish: true include: - - env: - - CMD="./mach test-tidy" - - DOCKER=0 - - env: - - CMD="./mach build -d --verbose" - - DOCKER=1 + - sudo: false + env: + - CMD="./mach test-tidy" + - DOCKER=0 + - sudo: 9000 + services: + - docker + env: + - CMD="./mach build -d --verbose" + - DOCKER=1 branches: only: |