Skip to content

Commit 829fce9

Browse files
committed
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
1 parent 838c196 commit 829fce9

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

.travis.compiler.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then
2222
exclude_modules;
2323
if which ccache ; then
2424
CMAKE_OPT="${CMAKE_OPT} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
25-
ccache --max-size=2200M
2625
fi
2726
if [[ "${CXX}" == 'clang++' ]]; then
2827
if [[ "${CC_VERSION}" == '6' ]]; then

.travis.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# travis-ci.org definition
33

44
sudo: false
5-
dist: trusty
5+
dist: xenial
66

77
git:
88
depth: 2
@@ -40,6 +40,9 @@ matrix:
4040
- os: osx
4141
compiler: clang
4242
env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
43+
- os: linux
44+
compiler: clang
45+
env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
4346
include:
4447
- os: linux
4548
compiler: gcc
@@ -83,13 +86,13 @@ matrix:
8386
- uuid-dev
8487
- devscripts
8588
- fakeroot
89+
- dh-systemd
90+
- libsystemd-dev
91+
- libzstd-dev
92+
- unixodbc-dev
8693
script:
8794
- ${CC} --version ; ${CXX} --version
88-
# https://github.com/travis-ci/travis-ci/issues/7062 - /run/shm isn't writable or executable
89-
# in trusty containers
90-
- export MTR_MEM=/tmp
9195
- env DEB_BUILD_OPTIONS="parallel=4" debian/autobake-deb.sh;
92-
- ccache --show-stats
9396
# Until OSX becomes a bit more stable: MDEV-12435 MDEV-16213
9497
allow_failures:
9598
- os: osx
@@ -110,17 +113,13 @@ matrix:
110113
- os: osx
111114
compiler: clang
112115
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
113-
- os: linux
114-
compiler: clang
115-
env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
116116

117117
addons:
118118
apt:
119119
sources:
120120
- ubuntu-toolchain-r-test
121-
- llvm-toolchain-trusty-6.0
122-
- llvm-toolchain-trusty-7
123-
- llvm-toolchain-trusty
121+
- llvm-toolchain-xenial-6.0
122+
- llvm-toolchain-xenial-7
124123
packages: # make sure these include all compilers and all build dependencies (see list above)
125124
- gcc-6
126125
- g++-6
@@ -132,8 +131,6 @@ addons:
132131
- llvm-6.0-dev
133132
- clang-7
134133
- llvm-7-dev
135-
- clang-8
136-
- llvm-8-dev
137134
- bison
138135
- chrpath
139136
- cmake
@@ -176,6 +173,7 @@ before_script:
176173
- df -h
177174
- ccache --version
178175
- ccache --show-stats
176+
- ccache --max-size=5G
179177

180178
script:
181179
# following modules are disabled after sourcing .travis.compiler.sh:
@@ -193,6 +191,8 @@ script:
193191
--suite=${MYSQL_TEST_SUITES}
194192
--skip-test-list=unstable-tests
195193
--skip-test=binlog.binlog_unsafe
194+
195+
after_script:
196196
- ccache --show-stats
197197
- df -h
198198

0 commit comments

Comments
 (0)