diff options
| author | Daniel Black <daniel.black@au.ibm.com> | 2016-08-24 13:29:09 +1000 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-12-15 10:36:11 +0400 |
| commit | e14bdcb81c88156ce5e413865f7fe124321120eb (patch) | |
| tree | 5eb403413ec6d1abbf52c40f2124bedcc3f36478 /.travis.yml | |
| parent | 9213ac8fd8fde72f2ecbf831bc657941964f8387 (diff) | |
| download | mariadb-git-e14bdcb81c88156ce5e413865f7fe124321120eb.tar.gz | |
travis: gcc-5 and gcc-6
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 3b609432e86..7677661587a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,21 @@ cache: - apt - ccache +env: + matrix: + - GCC_VERSION=5 + - GCC_VERSION=6 addons: apt: + sources: + - ubuntu-toolchain-r-test +# - llvm-toolchain-trusty-3.8 +# - llvm-toolchain-trusty-3.9 packages: # make sure these match debian/control contents + - gcc-5 + - g++-5 + - gcc-6 + - g++-6 - bison - chrpath - cmake @@ -48,7 +60,8 @@ addons: # libsystemd-daemon-dev # https://github.com/travis-ci/apt-package-whitelist/issues/3882 script: - - ${CC} --version ; ${CXX} --version + - export MYSQL_BUILD_CC=/usr/bin/gcc-${GCC_VERSION} MYSQL_BUILD_CXX=/usr/bin/g++-${GCC_VERSION} + - ${MYSQL_BUILD_CC} --version ; ${MYSQL_BUILD_CXX} --version - cd "${TRAVIS_BUILD_DIR}" - env DEB_BUILD_OPTIONS="parallel=4" debian/autobake-deb.sh; |