gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Travis: Use gcc-6 builds to test C++17 and CMake 3.8 (required for that).

Browse Source
This commit is contained in:
Frederich Munch 2017-06-10 15:41:57 -04:00 committed by sftnight
parent 5932c970b8
commit aef9f99c66
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml Executable file → Normal file
View File

@ -199,6 +199,13 @@ install:
PATH="$PATH:/usr/local/opt/coreutils/libexec/gnubin" PATH="$PATH:/usr/local/opt/coreutils/libexec/gnubin"
fi fi
if [ "$COMPILER" == "g++-6" ]; then
export CLING_BUILD_FLAGS="-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON"
CMAKEREQ="3.8"
else
CMAKEREQ="3.6"
fi
# Containers need to timeout before the buildscript exists # Containers need to timeout before the buildscript exists
if [ $TRAVIS_OS_NAME == 'osx' ] || [ "$DIST" == "trusty" ]; then if [ $TRAVIS_OS_NAME == 'osx' ] || [ "$DIST" == "trusty" ]; then
TIMEOUT='40m' # Any more and Travis might cancel TIMEOUT='40m' # Any more and Travis might cancel
@ -208,8 +215,7 @@ install:
# Turn this on to get the mapping to the cache.o to delete # Turn this on to get the mapping to the cache.o to delete
# export CCACHE_LOGFILE="$CLING_USER_ROOT/ccache.log" # export CCACHE_LOGFILE="$CLING_USER_ROOT/ccache.log"
# Require CMake >= 3.6 # Get installed CMake version and make sure its at least CMAKEREQ
CMAKEREQ="3.6"
CMKV=( `cmake --version` ) CMKV=( `cmake --version` )
CMKV=${CMKV[2]} CMKV=${CMKV[2]}
if [ "${CMKV:0:1}" -lt "${CMAKEREQ:0:1}" ] || [ "${CMKV:2:1}" -lt "${CMAKEREQ:2:1}" ]; then if [ "${CMKV:0:1}" -lt "${CMAKEREQ:0:1}" ] || [ "${CMKV:2:1}" -lt "${CMAKEREQ:2:1}" ]; then
@ -257,13 +263,15 @@ script:
--with-cling-url=https://github.com/$TRAVIS_REPO_SLUG \ --with-cling-url=https://github.com/$TRAVIS_REPO_SLUG \
--with-clang-url=http://root.cern.ch/git/clang.git \ --with-clang-url=http://root.cern.ch/git/clang.git \
--with-llvm-url=http://root.cern.ch/git/llvm.git \ --with-llvm-url=http://root.cern.ch/git/llvm.git \
--with-cmake-flags="$CLING_BUILD_FLAGS" \
--skip-cleanup --skip-cleanup
else else
tools/packaging/cpt.py \ tools/packaging/cpt.py \
--tarball-tag=$TRAVIS_TAG \ --tarball-tag=$TRAVIS_TAG \
--with-cling-url=https://github.com/$TRAVIS_REPO_SLUG \ --with-cling-url=https://github.com/$TRAVIS_REPO_SLUG \
--with-clang-url=http://root.cern.ch/git/clang.git \ --with-clang-url=http://root.cern.ch/git/clang.git \
--with-llvm-url=http://root.cern.ch/git/llvm.git --with-llvm-url=http://root.cern.ch/git/llvm.git \
--with-cmake-flags="$CLING_BUILD_FLAGS"
fi fi
RESULT="$?" RESULT="$?"