From 61d1751dfff71d8fd433c6c84bd39db1672a3ee6 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Wed, 5 Oct 2016 22:17:22 +0200 Subject: Travis: build matrix improvements + CPP11 build --- util/travis/script.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'util/travis/script.sh') diff --git a/util/travis/script.sh b/util/travis/script.sh index 870954ebb..4f37d8f5a 100755 --- a/util/travis/script.sh +++ b/util/travis/script.sh @@ -4,6 +4,10 @@ if [[ $PLATFORM == "Unix" ]]; then mkdir -p travisbuild cd travisbuild || exit 1 CMAKE_FLAGS='' + if [[ $COMPILER == "g++-6" ]]; then + export CC=gcc-6 + export CXX=g++-6 + fi # Clang builds with FreeType fail on Travis if [[ $CC == "clang" ]]; then CMAKE_FLAGS+=' -DENABLE_FREETYPE=FALSE' -- cgit v1.2.3 From adad6e0a1c2bb6cd5e56db26d660fa9342cf0d0e Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 15 Oct 2016 17:59:23 +0200 Subject: Travis: Only trigger a compile, when C/C++ related files were touched (#4284) --- util/travis/before_install.sh | 4 ++++ util/travis/common.sh | 8 ++++++++ util/travis/script.sh | 3 +++ 3 files changed, 15 insertions(+) create mode 100644 util/travis/common.sh (limited to 'util/travis/script.sh') diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index d25614edb..891371984 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -1,4 +1,8 @@ #!/bin/bash -e +echo "Preparing for $TRAVIS_COMMIT_RANGE" +. util/travis/common.sh + +needs_compile || exit 0 if [[ $TRAVIS_OS_NAME == "linux" ]]; then sudo apt-get update diff --git a/util/travis/common.sh b/util/travis/common.sh new file mode 100644 index 000000000..16c7db324 --- /dev/null +++ b/util/travis/common.sh @@ -0,0 +1,8 @@ +#!/bin/bash -e + +# Relative to git-repository root: +TRIGGER_COMPILE_PATHS="src/|CMakeLists.txt|cmake/Modules/|util/travis/|util/buildbot/" + +needs_compile() { + git diff --name-only $TRAVIS_COMMIT_RANGE | egrep -q "^($TRIGGER_COMPILE_PATHS)" +} diff --git a/util/travis/script.sh b/util/travis/script.sh index 4f37d8f5a..1bafb26cd 100755 --- a/util/travis/script.sh +++ b/util/travis/script.sh @@ -1,4 +1,7 @@ #!/bin/bash -e +. util/travis/common.sh + +needs_compile || exit 0 if [[ $PLATFORM == "Unix" ]]; then mkdir -p travisbuild -- cgit v1.2.3