sudoless
This commit is contained in:
parent
34b685db40
commit
e53f4e8637
1 changed files with 12 additions and 10 deletions
22
.travis.yml
22
.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
|
||||
|
|
Loading…
Add table
Reference in a new issue