diff options
| author | Otto Kekäläinen <otto@mariadb.org> | 2016-10-08 03:28:41 +0300 |
|---|---|---|
| committer | Otto Kekäläinen <otto@mariadb.org> | 2016-10-08 16:41:47 +0300 |
| commit | 0331df13fa2eb938f411a148614b9045d317ab05 (patch) | |
| tree | a6a1747a3ab644458a2f43a421662c0df0f8a130 /.travis.yml | |
| parent | 553ca406cd44946d454d84c08a7247ef595378f5 (diff) | |
| download | mariadb-git-0331df13fa2eb938f411a148614b9045d317ab05.tar.gz | |
Travis-CI: clean away cruf in definition file and use correct syntax
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index b09c348dfab..d850a0d681e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,9 @@ dist: trusty language: cpp compiler: - gcc -# - clang # See commit f38808 if you want to re-enable clang builds cache: - apt: - ccache: - -# Timing on build an test needs to be < 50 minutes. The compile is ~4-5minutes -# so here we group the tests such that this happens. + - apt + - ccache addons: apt: @@ -37,7 +33,7 @@ addons: - po-debconf - psmisc - zlib1g-dev - - libcrack2-dev # no effect as the package is disallowed on Travis-CI + - libcrack2-dev - libjemalloc-dev - devscripts # implicit for any build on Ubuntu |