diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-14 09:40:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-14 09:40:12 +0200 |
| commit | ac9b818c241cf59adbe3e9bd8d252736d23c671f (patch) | |
| tree | 70f12a8a6773930f963dbf961ca2314e53c85df3 /.travis.yml | |
| parent | e7924a8598cbb785363ddd6489cb3c1210347f5f (diff) | |
| parent | 69290ce3ebe6290c4816905f38d408a0ebbaf4a0 (diff) | |
| download | mariadb-git-ac9b818c241cf59adbe3e9bd8d252736d23c671f.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 0e1d859e7c2..85d02cc4bec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ 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 - 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=rocksdb,versioning - 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 @@ -109,7 +109,7 @@ matrix: env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption - os: osx compiler: clang - env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb + env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning - os: osx compiler: clang 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 @@ -165,7 +165,7 @@ addons: before_install: - if [[ "${TRAVIS_OS_NAME}" == 'osx' ]]; then brew update; - brew install gnutls lz4 lzo xz snappy ccache jemalloc curl ossp-uuid pcre; + brew install gnutls lz4 lzo xz snappy ccache jemalloc curl ossp-uuid pcre zstd; brew link ccache; export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi |