From cf722462438707871e53bd96235b767e77dce6d3 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Wed, 9 Jan 2013 21:55:34 +0100 Subject: Disabled travis e-mail notifications --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 660a2f5..6763668 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,3 +6,5 @@ before_install: - git submodule update --init --recursive - sudo apt-get update -qq - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin +notifications: + email: false -- cgit v1.2.3-1-g7c22 From 3c94a6987007b60355dedb9db5c7bdef48b28369 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Wed, 9 Jan 2013 23:41:18 +0100 Subject: Added GLEW to travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 6763668..9690ccf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,6 @@ script: cmake . -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test before_install: - git submodule update --init --recursive - sudo apt-get update -qq - - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin + - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin notifications: email: false -- cgit v1.2.3-1-g7c22 From d221233436063d83f920731c83582ca115c93b6d Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Thu, 10 Jan 2013 09:49:25 +0100 Subject: Enable clang build in travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 9690ccf..772f403 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: cpp compiler: - gcc + - clang script: cmake . -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test before_install: - git submodule update --init --recursive -- cgit v1.2.3-1-g7c22 From f7f4bd945ce20b26f13c4ea90feffa8e6ebf3038 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Thu, 10 Jan 2013 10:36:46 +0100 Subject: In travis, do out-of-tree build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 772f403..442ccdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: cpp compiler: - gcc - clang -script: cmake . -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test +script: mkdir build; cd build; cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test before_install: - git submodule update --init --recursive - sudo apt-get update -qq -- cgit v1.2.3-1-g7c22 From e39e802d8314042bc8126484a71cee3952360a59 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Thu, 10 Jan 2013 10:37:16 +0100 Subject: Also test intallation --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 442ccdd..bb99d26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: cpp compiler: - gcc - clang -script: mkdir build; cd build; cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test +script: mkdir build; cd build; cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test && DESTDIR=. make install before_install: - git submodule update --init --recursive - sudo apt-get update -qq -- cgit v1.2.3-1-g7c22 From 0f74cf96b784b59853e7fe44dc2c89d48785cf46 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Thu, 10 Jan 2013 11:07:20 +0100 Subject: In travis, add boost backport from Mapnik to succeed clang build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index bb99d26..96a7443 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ compiler: script: mkdir build; cd build; cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test && DESTDIR=. make install before_install: - git submodule update --init --recursive + - sudo add-apt-repository ppa:mapnik/boost -y - sudo apt-get update -qq - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin notifications: -- cgit v1.2.3-1-g7c22 From 0ef831429a1988d6c0b303854a03d31f780eaa88 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 20 Jan 2013 15:15:55 +0100 Subject: In travis, add libsndfile-dev as build-dependency --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 96a7443..af27ea3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,6 @@ before_install: - git submodule update --init --recursive - sudo add-apt-repository ppa:mapnik/boost -y - sudo apt-get update -qq - - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin + - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin libsndfile-dev notifications: email: false -- cgit v1.2.3-1-g7c22 From 15682c27e3be211cac2ab0f3c0c708c12679cfc3 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Thu, 14 Feb 2013 15:59:24 +0100 Subject: Temporairly disabled "test" in travis It always fails. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index af27ea3..275f195 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: cpp compiler: - gcc - clang -script: mkdir build; cd build; cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test && DESTDIR=. make install +script: mkdir build; cd build; cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc && DESTDIR=. make install before_install: - git submodule update --init --recursive - sudo add-apt-repository ppa:mapnik/boost -y -- cgit v1.2.3-1-g7c22 From 22b7a1b1ad78eb4a0df98fbd063c2ce81aaa1314 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Thu, 14 Feb 2013 18:43:05 +0100 Subject: Revert "Temporairly disabled "test" in travis" This reverts commit 15682c27e3be211cac2ab0f3c0c708c12679cfc3. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 275f195..af27ea3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: cpp compiler: - gcc - clang -script: mkdir build; cd build; cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc && DESTDIR=. make install +script: mkdir build; cd build; cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test && DESTDIR=. make install before_install: - git submodule update --init --recursive - sudo add-apt-repository ppa:mapnik/boost -y -- cgit v1.2.3-1-g7c22 From 5f1c202a6b35a0b5c102d9ab6b8bf1e730ce5a03 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Mon, 25 Mar 2013 09:59:50 +0100 Subject: Travis change from #148 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index af27ea3..2750af2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,9 @@ script: mkdir build; cd build; cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make all before_install: - git submodule update --init --recursive - sudo add-apt-repository ppa:mapnik/boost -y + - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get update -qq + - 'if [ "$CXX" = "g++" ]; then sudo apt-get -qq install g++ g++-4.7 && export CXX=g++-4.7 && export CC=gcc-4.7; fi' - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin libsndfile-dev notifications: email: false -- cgit v1.2.3-1-g7c22 From 0d5a9358fc7f45d0b7636151f305b021f343d187 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Mon, 25 Mar 2013 10:18:08 +0100 Subject: Revert "Travis change from #148" This reverts commit 5f1c202a6b35a0b5c102d9ab6b8bf1e730ce5a03. Reverting change because we still need to check GCC 4.6 compatibility. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 2750af2..af27ea3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,7 @@ script: mkdir build; cd build; cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make all before_install: - git submodule update --init --recursive - sudo add-apt-repository ppa:mapnik/boost -y - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get update -qq - - 'if [ "$CXX" = "g++" ]; then sudo apt-get -qq install g++ g++-4.7 && export CXX=g++-4.7 && export CC=gcc-4.7; fi' - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin libsndfile-dev notifications: email: false -- cgit v1.2.3-1-g7c22