sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify travis config

Browse source
This commit is contained in:
Dane Springmeyer 2014-07-22 16:14:22 -07:00
parent cfd971428c
commit db4a2daf28
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.travis.yml
View file

@ -7,11 +7,6 @@ compiler:
addons: addons:
postgresql: "9.3" postgresql: "9.3"
env:
- TESTS_TO_RUN=python BINDINGS=python CPP_TESTS=false BENCHMARK=false DEMO=False
- TESTS_TO_RUN=visual BINDINGS=python CPP_TESTS=false BENCHMARK=false DEMO=False
- TESTS_TO_RUN=cpp BINDINGS=none CPP_TESTS=true BENCHMARK=true DEMO=True
before_install: before_install:
- nproc - nproc
- free - free
@ -23,9 +18,7 @@ before_install:
# more recent boost # more recent boost
- sudo add-apt-repository -y ppa:boost-latest/ppa - sudo add-apt-repository -y ppa:boost-latest/ppa
- sudo apt-get update -y - sudo apt-get update -y
# upgrade compilers - sudo apt-get install -y gcc-4.8 g++-4.8 make boost1.55 libgdal-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev
- sudo apt-get install -y gcc-4.8 g++-4.8
- sudo apt-get install -y make boost1.55 libgdal-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev
- wget http://mapnik.s3.amazonaws.com/deps/harfbuzz-0.9.32.tar.bz2 - wget http://mapnik.s3.amazonaws.com/deps/harfbuzz-0.9.32.tar.bz2
- tar xf harfbuzz-0.9.32.tar.bz2 - tar xf harfbuzz-0.9.32.tar.bz2
- cd harfbuzz-0.9.32 - cd harfbuzz-0.9.32
@ -35,14 +28,14 @@ before_install:
install: install:
- if [[ "${CXX}" == 'g++' ]]; then export CXX="g++-4.8" && export CC="gcc-4.8"; fi; - if [[ "${CXX}" == 'g++' ]]; then export CXX="g++-4.8" && export CC="gcc-4.8"; fi;
- ./configure CXX="${CXX}" CC="${CC}" DEMO=${DEMO} BINDINGS=${BINDINGS} BENCHMARK=${BENCHMARK} CPP_TESTS=${CPP_TESTS} CAIRO=True FAST=True - ./configure CXX="${CXX}" CC="${CC}" DEMO=True BENCHMARK=True CPP_TESTS=True CAIRO=True FAST=True
- JOBS=2 make - JOBS=2 make
before_script: before_script:
- make test-$TESTS_TO_RUN - make test
script: script:
- if [[ "${BENCHMARK}" == true ]]; then make bench; fi; - make bench
notifications: notifications:
irc: irc: