From 021f2939b69963c26ee1532b90be9103d6eddc80 Mon Sep 17 00:00:00 2001 From: Axel Haustant Date: Sun, 2 Sep 2012 13:48:49 +0200 Subject: [PATCH 1/5] Initial Travis CI configuration. --- .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..8ec7973c9 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,15 @@ +language: cpp + +matrix: + include: + - compiler: clang + env: CXX_SCONS="-Qunused-arguments -fcolor-diagnostics" WARNING_CXXFLAGS="-Wno-unused-function -Wno-uninitialized -Wno-array-bounds -Wno-parentheses -Wno-char-subscripts -Wno-internal-linkage-in-inline" + +before_install: + - echo 'yes' | sudo add-apt-repository ppa:mapnik/boost + - sudo apt-get update -qq + - sudo apt-get install -qq libboost-dev libboost-filesystem-dev libboost-program-options-dev libboost-python-dev libboost-regex-dev libboost-system-dev libboost-thread-dev + - sudo apt-get install -qq libicu-dev libpng-dev libjpeg-dev libtiff-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libpq-dev libgdal-dev libcairomm-1.0-dev python-cairo-dev libsqlite3-dev + - sudo apt-get install -qq ccache python-nose + +script: scons configure JOBS=4 FAST=True CXX="ccache $CXX $CXX_SCONS" WARNING_CXXFLAGS=$WARNING_CXXFLAGS && sudo make install && make test From 08b5a81b646283545e2ddb51fb36f0f257a51d84 Mon Sep 17 00:00:00 2001 From: Axel Haustant Date: Sun, 2 Sep 2012 16:20:37 +0200 Subject: [PATCH 2/5] Added Travis CI badge to README.md --- README.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c56245856..835152ff2 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,14 @@ -``` - _/ _/ _/ _/ - _/_/ _/_/ _/_/_/ _/_/_/ _/_/_/ _/ _/ - _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/ - _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ -_/ _/ _/_/_/ _/_/_/ _/ _/ _/ _/ _/ - _/ - _/ ``` + _/ _/ _/ _/ + _/_/ _/_/ _/_/_/ _/_/_/ _/_/_/ _/ _/ + _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/ + _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ +_/ _/ _/_/_/ _/_/_/ _/ _/ _/ _/ _/ + _/ + _/ +``` + +[![Build Status](https://secure.travis-ci.org/mapnik/mapnik.png)](http://travis-ci.org/mapnik/mapnik) # What is Mapnik? From 15ecc6b7cd84ac38b0ff74722fd61f0b63a2db85 Mon Sep 17 00:00:00 2001 From: Axel Haustant Date: Tue, 4 Sep 2012 11:01:11 +0200 Subject: [PATCH 3/5] Do not use ccache --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8ec7973c9..a18857a2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,4 +12,4 @@ before_install: - sudo apt-get install -qq libicu-dev libpng-dev libjpeg-dev libtiff-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libpq-dev libgdal-dev libcairomm-1.0-dev python-cairo-dev libsqlite3-dev - sudo apt-get install -qq ccache python-nose -script: scons configure JOBS=4 FAST=True CXX="ccache $CXX $CXX_SCONS" WARNING_CXXFLAGS=$WARNING_CXXFLAGS && sudo make install && make test +script: scons configure JOBS=4 FAST=True CXX="$CXX $CXX_SCONS" WARNING_CXXFLAGS=$WARNING_CXXFLAGS && sudo make install && make test From 384ff45444662897966ce7387680ddcdc092dc6b Mon Sep 17 00:00:00 2001 From: Axel Haustant Date: Tue, 4 Sep 2012 11:23:04 +0200 Subject: [PATCH 4/5] Do not install ccache and gain time on apt installations --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a18857a2c..2c6c3ff41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ matrix: before_install: - echo 'yes' | sudo add-apt-repository ppa:mapnik/boost - sudo apt-get update -qq - - sudo apt-get install -qq libboost-dev libboost-filesystem-dev libboost-program-options-dev libboost-python-dev libboost-regex-dev libboost-system-dev libboost-thread-dev - - sudo apt-get install -qq libicu-dev libpng-dev libjpeg-dev libtiff-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libpq-dev libgdal-dev libcairomm-1.0-dev python-cairo-dev libsqlite3-dev - - sudo apt-get install -qq ccache python-nose + - sudo apt-get install -qq libboost-dev libboost-filesystem-dev libboost-program-options-dev libboost-python-dev libboost-regex-dev libboost-system-dev libboost-thread-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libpq-dev libgdal-dev libcairomm-1.0-dev python-cairo-dev libsqlite3-dev script: scons configure JOBS=4 FAST=True CXX="$CXX $CXX_SCONS" WARNING_CXXFLAGS=$WARNING_CXXFLAGS && sudo make install && make test From 866256c01c61cdc8599e783176319099c1988049 Mon Sep 17 00:00:00 2001 From: Axel Haustant Date: Tue, 4 Sep 2012 16:30:43 +0200 Subject: [PATCH 5/5] Set JOBS=2 (best build time) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2c6c3ff41..1ac38c607 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,4 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -qq libboost-dev libboost-filesystem-dev libboost-program-options-dev libboost-python-dev libboost-regex-dev libboost-system-dev libboost-thread-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libpq-dev libgdal-dev libcairomm-1.0-dev python-cairo-dev libsqlite3-dev -script: scons configure JOBS=4 FAST=True CXX="$CXX $CXX_SCONS" WARNING_CXXFLAGS=$WARNING_CXXFLAGS && sudo make install && make test +script: scons configure JOBS=2 FAST=True CXX="$CXX $CXX_SCONS" WARNING_CXXFLAGS=$WARNING_CXXFLAGS && sudo make install && make test