1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

travis: add clang-5.0

Browse Source 
Also removed clang-3.9

Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
This commit is contained in:
Daniel Black 2017-08-07 11:04:09 +10:00 committed by Sergey Vojtovich
parent 29ad628491
commit c508691a93
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.compiler.sh
View File

@ -8,8 +8,8 @@ if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then
CMAKE_OPT="${CMAKE_OPT} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" CMAKE_OPT="${CMAKE_OPT} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
fi fi
case ${GCC_VERSION} in case ${GCC_VERSION} in
5) CXX=clang++-3.9 ;; 5) CXX=clang++-4.0 ;;
6) CXX=clang++-4.0 ;; 6) CXX=clang++-5.0 ;;
esac esac
export CXX CC=${CXX/++/} export CXX CC=${CXX/++/}
elif [[ "${CXX}" == 'g++' ]]; then elif [[ "${CXX}" == 'g++' ]]; then

7
.travis.yml
View File

@ -136,18 +136,17 @@ addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty
- llvm-toolchain-trusty-3.9
- llvm-toolchain-trusty-4.0 - llvm-toolchain-trusty-4.0
- sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main'
packages: # make sure these match the build requirements packages: # make sure these match the build requirements
- gcc-5 - gcc-5
- g++-5 - g++-5
- gcc-6 - gcc-6
- g++-6 - g++-6
- clang-3.9
- llvm-3.9-dev
- clang-4.0 - clang-4.0
- llvm-4.0-dev - llvm-4.0-dev
- clang-5.0
- llvm-5.0-dev
- libasan0 - libasan0
- bison - bison
- chrpath - chrpath