diff options
| author | Teodor Mircea Ionita <teodor@mariadb.org> | 2018-12-25 12:01:13 +0000 |
|---|---|---|
| committer | Teodor Mircea Ionita <teodor@mariadb.org> | 2018-12-26 16:26:36 +0000 |
| commit | 829fce9ea6ee984f49b6a77a442435e38fd98cfa (patch) | |
| tree | 83c3a1f1a238a526e4031ae704cd13daf2c99d56 /.travis.yml | |
| parent | 838c196f2638b3ece9ee7d9d222442e756dbfc06 (diff) | |
| download | mariadb-git-829fce9ea6ee984f49b6a77a442435e38fd98cfa.tar.gz | |
travis: upgrade Ubuntu target dist to 16.04 Xenial
Ubuntu 14.04 Trusty is LTS until April 2019 and since we are
approaching that, upgrade to Xenial which is LTS until April 2021.
One bonus of this upgrade is that the Travis Xenial virtual images
have a much bigger disk size, thus no need to limit ccache below
the default of 5G anymore.
Also had to remove linux/clang-8 toolchain testing since
llvm-toolchain-xenial is not listed at:
https://github.com/travis-ci/apt-source-safelist/blob/master/ubuntu.json
And fails with:
Disallowing sources: llvm-toolchain-xenial
...
E: Unable to locate package clang-8
E: Unable to locate package llvm-8-dev
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 9bdebb4f7c4..5bc26d97f86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ # travis-ci.org definition sudo: false -dist: trusty +dist: xenial git: depth: 2 @@ -40,6 +40,9 @@ matrix: - os: osx compiler: clang env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main + - os: linux + compiler: clang + env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main include: - os: linux compiler: gcc @@ -83,13 +86,13 @@ matrix: - uuid-dev - devscripts - fakeroot + - dh-systemd + - libsystemd-dev + - libzstd-dev + - unixodbc-dev script: - ${CC} --version ; ${CXX} --version - # https://github.com/travis-ci/travis-ci/issues/7062 - /run/shm isn't writable or executable - # in trusty containers - - export MTR_MEM=/tmp - env DEB_BUILD_OPTIONS="parallel=4" debian/autobake-deb.sh; - - ccache --show-stats # Until OSX becomes a bit more stable: MDEV-12435 MDEV-16213 allow_failures: - os: osx @@ -110,17 +113,13 @@ matrix: - 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 - - os: linux - compiler: clang - env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-6.0 - - llvm-toolchain-trusty-7 - - llvm-toolchain-trusty + - llvm-toolchain-xenial-6.0 + - llvm-toolchain-xenial-7 packages: # make sure these include all compilers and all build dependencies (see list above) - gcc-6 - g++-6 @@ -132,8 +131,6 @@ addons: - llvm-6.0-dev - clang-7 - llvm-7-dev - - clang-8 - - llvm-8-dev - bison - chrpath - cmake @@ -176,6 +173,7 @@ before_script: - df -h - ccache --version - ccache --show-stats + - ccache --max-size=5G script: # following modules are disabled after sourcing .travis.compiler.sh: @@ -193,6 +191,8 @@ script: --suite=${MYSQL_TEST_SUITES} --skip-test-list=unstable-tests --skip-test=binlog.binlog_unsafe + +after_script: - ccache --show-stats - df -h |