diff options
| author | Davide Beatrici <davidebeatrici@gmail.com> | 2019-03-03 22:31:57 +0300 |
|---|---|---|
| committer | Davide Beatrici <davidebeatrici@gmail.com> | 2019-03-10 06:57:11 +0300 |
| commit | 12f3ba1e69808d301e96298c45ed856de37db158 (patch) | |
| tree | 6cd2eb243adc4558ed8136361d3647bf86a95f74 /.travis.yml | |
| parent | d56005629f76c8c244ffbe3dd727f54b5ce57b86 (diff) | |
travis-ci: switch to Xenial for Qt 5 builds, improve matrix, update MXE mirror
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml index a269755fe..8975098f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,37 +1,29 @@ sudo: required # Required for apt-get build-dep -dist: trusty language: cpp compiler: gcc -os: - - linux - - osx - -env: - - MUMBLE_QT=qt4 MUMBLE_HOST=x86_64-linux-gnu - - MUMBLE_QT=qt4 MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1 - - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu - - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1 - - MUMBLE_QT=qt5 MUMBLE_HOST=i686-w64-mingw32 - - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-w64-mingw32 - - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-apple-darwin - matrix: - exclude: + include: - os: linux - env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-apple-darwin - - os: osx + dist: trusty env: MUMBLE_QT=qt4 MUMBLE_HOST=x86_64-linux-gnu - - os: osx + - os: linux + dist: trusty env: MUMBLE_QT=qt4 MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1 - - os: osx + - os: linux + dist: xenial env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu - - os: osx + - os: linux + dist: xenial env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1 - - os: osx + - os: linux + dist: xenial env: MUMBLE_QT=qt5 MUMBLE_HOST=i686-w64-mingw32 - - os: osx + - os: linux + dist: xenial env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-w64-mingw32 + - os: osx + env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-apple-darwin before_install: - ./scripts/travis-ci/before_install.bash |