diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2018-11-23 10:41:38 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@linux.ibm.com> | 2018-11-23 15:03:05 +1100 |
| commit | 83b7372b29d1a230554b530067d7ed3f38d16e02 (patch) | |
| tree | 823537040d92a71ea1320276a9093fd36193db03 /.travis.yml | |
| parent | 46a411088c5abbacda4e52e89f4dbcf52a451f7a (diff) | |
| download | mariadb-git-83b7372b29d1a230554b530067d7ed3f38d16e02.tar.gz | |
travis: update CC_VERSIONS to 6 and 7
Use clang-6,7 too.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 95e0796099b..a72028b0cd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,12 +25,12 @@ 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 matrix: exclude: @@ -90,38 +90,38 @@ 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 addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-5.0 - llvm-toolchain-trusty-6.0 + - llvm-toolchain-trusty-7 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 - clang-6.0 - llvm-6.0-dev + - clang-7 + - llvm-7-dev - bison - chrpath - cmake |