diff options
| author | Otto Kekäläinen <otto@mariadb.org> | 2017-11-17 12:18:16 +0800 |
|---|---|---|
| committer | Vicențiu-Marian Ciorbaru <cvicentiu@gmail.com> | 2017-11-21 13:07:26 +0200 |
| commit | feec04f29db95e9e43b68fbea4592a66f591626a (patch) | |
| tree | 9712af458d679fc6c89be40621c3218b56ff8375 /.travis.yml | |
| parent | 325c9ce9b39a7695bf217cd92fc36034b2e8207b (diff) | |
| download | mariadb-git-feec04f29db95e9e43b68fbea4592a66f591626a.tar.gz | |
Travis-CI: clean up cruft and add more in-line commments
This will make these files easier to maintain in the future.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 41 |
1 files changed, 3 insertions, 38 deletions
diff --git a/.travis.yml b/.travis.yml index ce4037ca484..444c1c0d790 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,16 +18,12 @@ compiler: cache: apt: true - ccache: true + ccache: true # Does not currently work for clang builds: https://github.com/travis-ci/travis-ci/issues/6201 directories: - - /usr/local/Cellar + - /usr/local/Cellar # Fails do to permission error: https://github.com/travis-ci/travis-ci/issues/8092 env: matrix: -# - GCC_VERSION=4.8 TYPE=Debug MYSQL_TEST_SUITES=rpl -# - GCC_VERSION=5 TYPE=Debug MYSQL_TEST_SUITES=main,archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts -# - GCC_VERSION=6 TYPE=Debug MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption,rocksdb -# - GCC_VERSION=6 TYPE=Debug MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles - GCC_VERSION=4.8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl - GCC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main,archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts - GCC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption,rocksdb @@ -102,44 +98,13 @@ matrix: compiler: clang env: GCC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles -# Matrix include for coverity -# - env: -# - GCC_VERSION=6 -# addon: -# coverity_scan: -# # ref: https://scan.coverity.com/travis_ci -# # GitHub project metadata -# project: -# - name: MariaDB/server -# - description: MariaDB Server -# -# # Where email notification of build analysis results will be sent -# notification_email: security@mariadb.org -# -# # Commands to prepare for build_command -# build_command_prepend: -# - source .travis.compiler.sh -# - ${MYSQL_BUILD_CC} --version ; ${MYSQL_BUILD_CXX} --version -# - cmake . -# -DCMAKE_BUILD_TYPE=Debug -# -DWITH_SSL=system -DWITH_ZLIB=system -# -DWITHOUT_TOKUDB_STORAGE_ENGINE=ON -DWITHOUT_MROONGA_STORAGE_ENGINE=ON -# -# # The command that will be added as an argument to "cov-build" to compile your project for analysis, -# build_command: make -j 4 -# -# # Pattern to match selecting branches that will run analysis. -# # Take care in resource usage, and consider the build frequency allowances per -# # https://scan.coverity.com/faq#frequency - 7 per week is the current limit. -# branch_pattern: .*coverity.* - addons: apt: sources: - ubuntu-toolchain-r-test - 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 include all compilers and all build dependencies (see list above) - gcc-5 - g++-5 - gcc-6 |