From e53f4e863729fca963bb9d9cb579e72dc27d3988 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 23 Jan 2015 14:21:54 -0800
Subject: [PATCH] sudoless

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

diff --git a/.travis.yml b/.travis.yml
index d793c5488..218199f5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: cpp
 
+sudo: false
+
 compiler:
  - clang
  - gcc
@@ -8,20 +10,20 @@ compiler:
 # the below is thanks to https://github.com/CartoDB/Windshaft/blob/d82fe08b32fc7907bbe907ab290f8a082215ae26/.travis.yml#L1
 before_install:
   - export PGUSER=postgres
-  - sudo mv /etc/apt/sources.list.d/pgdg-source.list* /tmp
-  - sudo apt-get -qq purge postgis* postgresql*
-  - sudo apt-add-repository -y ppa:cartodb/postgresql-9.3
+  #- sudo mv /etc/apt/sources.list.d/pgdg-source.list* /tmp
+  #- sudo apt-get -qq purge postgis* postgresql*
+  #- sudo apt-add-repository -y ppa:cartodb/postgresql-9.3
   # enable to test against latest boost rather that v1.48
   #- sudo add-apt-repository -y ppa:boost-latest/ppa
-  - sudo rm -Rf /var/lib/postgresql /etc/postgresql
-  - sudo apt-get update -qq
-  - sudo apt-get install -q postgresql-9.3-postgis-2.1 postgresql-contrib-9.3
-  - echo -e "local\tall\tall\ttrust\nhost\tall\tall\t127.0.0.1/32\ttrust\nhost\tall\tall\t::1/128\ttrust" |sudo tee /etc/postgresql/9.3/main/pg_hba.conf
-  - sudo service postgresql restart
+  #- sudo rm -Rf /var/lib/postgresql /etc/postgresql
+  #- sudo apt-get update -qq
+  #- sudo apt-get install -q postgresql-9.3-postgis-2.1 postgresql-contrib-9.3
+  #- echo -e "local\tall\tall\ttrust\nhost\tall\tall\t127.0.0.1/32\ttrust\nhost\tall\tall\t::1/128\ttrust" |sudo tee /etc/postgresql/9.3/main/pg_hba.conf
+  #- sudo service postgresql restart
 
 install:
  # enable to test against boost ppa
- - sudo apt-get install -y ttf-wqy-microhei make valgrind python-nose 
+ #- sudo apt-get install -y ttf-wqy-microhei make valgrind python-nose 
 
 before_script:
  - psql -U postgres -c 'create database template_postgis'
@@ -32,5 +34,5 @@ script:
  - JOBS=2 make
  - git clone --depth=1 https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
  - make test
- - source localize.sh && make grind
+ #- source localize.sh && make grind
  - make bench