From cccf326d12594bab5bd81a6b0e1c95a50dcd6af2 Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Sun, 11 Oct 2015 10:46:45 -0400
Subject: [PATCH 1/2] Use Travis container-based infra for test-tidy

---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f3e65d62125..e54d5484cda 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,10 +10,14 @@ script:
 matrix:
   fast_finish: true
   include:
-    - env:
+    - sudo: false
+      env:
       - CMD="./mach test-tidy"
       - DOCKER=0
-    - env:
+    - sudo: 9000
+      services:
+      - docker
+      env:
       - CMD="./mach build -d --verbose"
       - DOCKER=1
 

From 1aed8503b0ac54bc195c1e52ff35154ff01ed7ee Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Sun, 11 Oct 2015 11:09:06 -0400
Subject: [PATCH 2/2] Use consistent indentation in YAML file

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e54d5484cda..d8179c9a525 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,14 +12,14 @@ matrix:
   include:
     - sudo: false
       env:
-      - CMD="./mach test-tidy"
-      - DOCKER=0
+        - CMD="./mach test-tidy"
+        - DOCKER=0
     - sudo: 9000
       services:
-      - docker
+        - docker
       env:
-      - CMD="./mach build -d --verbose"
-      - DOCKER=1
+        - CMD="./mach build -d --verbose"
+        - DOCKER=1
 
 branches:
   only: