diff options
| -rwxr-xr-x | .travis.compiler.sh | 12 | ||||
| -rw-r--r-- | .travis.yml | 46 |
2 files changed, 39 insertions, 19 deletions
diff --git a/.travis.compiler.sh b/.travis.compiler.sh index 6b8de374219..96872ef9539 100755 --- a/.travis.compiler.sh +++ b/.travis.compiler.sh @@ -25,12 +25,20 @@ if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then ccache --max-size=2200M fi if [[ "${CXX}" == 'clang++' ]]; then - export CXX CC=${CXX/++/} + if [[ "${CC_VERSION}" == '6' ]]; then + export CXX=${CXX}-${CC_VERSION}.0 + else + export CXX=${CXX}-${CC_VERSION} + fi + export CC=${CXX/++/} + # excess warnings about unused include path + export CFLAGS='-Wno-unused-command-line-argument' + export CXXFLAGS='-Wno-unused-command-line-argument' elif [[ "${CXX}" == 'g++' ]]; then export CXX=g++-${CC_VERSION} export CC=gcc-${CC_VERSION} fi - if [[ ${CC_VERSION} == 6 ]]; then + if [[ ${CC_VERSION} == 7 ]]; then wget http://mirrors.kernel.org/ubuntu/pool/universe/p/percona-xtradb-cluster-galera-2.x/percona-xtradb-cluster-galera-2.x_165-0ubuntu1_amd64.deb ; ar vx percona-xtradb-cluster-galera-2.x_165-0ubuntu1_amd64.deb tar -xJvf data.tar.xz diff --git a/.travis.yml b/.travis.yml index 629e3b31523..9bdebb4f7c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,17 +25,21 @@ cache: env: matrix: - - CC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main - - CC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts - - CC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl - - CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption - - CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb - - CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles + - CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main + - CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts + - CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl + - CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption + - CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb + - CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles + - CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main matrix: exclude: - os: osx compiler: gcc + - os: osx + compiler: clang + env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main include: - os: linux compiler: gcc @@ -90,38 +94,46 @@ matrix: allow_failures: - os: osx compiler: clang - env: CC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl + env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl - os: osx compiler: clang - env: CC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main + env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main - os: osx compiler: clang - env: CC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts + env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts - os: osx compiler: clang - env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption + env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption - os: osx compiler: clang - env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb + env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb - os: osx compiler: clang - env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles + env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles + - os: linux + compiler: clang + env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-5.0 - llvm-toolchain-trusty-6.0 + - llvm-toolchain-trusty-7 + - llvm-toolchain-trusty packages: # make sure these include all compilers and all build dependencies (see list above) - - gcc-5 - - g++-5 - gcc-6 - g++-6 - - clang-5.0 - - llvm-5.0-dev + - gcc-7 + - g++-7 + - gcc-8 + - g++-8 - clang-6.0 - llvm-6.0-dev + - clang-7 + - llvm-7-dev + - clang-8 + - llvm-8-dev - bison - chrpath - cmake |