diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-09-25 09:29:54 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-09-25 12:14:28 +0200 |
| commit | a269e0c92f27fcae19622f15f2d82b45f893aaa6 (patch) | |
| tree | 5bbd5de7c7e1bb29bbd22400dd277c4e69b271c5 | |
| parent | f8c5cee98265f393cb07a97e2d1d3b38cf26400f (diff) | |
| download | MultiMC-a269e0c92f27fcae19622f15f2d82b45f893aaa6.tar MultiMC-a269e0c92f27fcae19622f15f2d82b45f893aaa6.tar.gz MultiMC-a269e0c92f27fcae19622f15f2d82b45f893aaa6.tar.lz MultiMC-a269e0c92f27fcae19622f15f2d82b45f893aaa6.tar.xz MultiMC-a269e0c92f27fcae19622f15f2d82b45f893aaa6.zip | |
NOISSUE force travis.ci to use precise, fix ppa for Qt
| -rw-r--r-- | .travis.yml | 41 | ||||
| -rw-r--r-- | travis/prepare.sh | 14 |
2 files changed, 29 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml index e2245a8f..19f39c2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,29 +2,28 @@ language: cpp cache: apt -# Build matrix set up -compiler: - - gcc -# - clang -os: - - linux -# - osx -env: - - QT_VERSION=5.4.2 - - QT_VERSION=5.5.1 - # - QT_VERSION=5.6.2 matrix: - exclude: - # only use clang on OS X - - os: osx + include: + - os: linux + dist: precise + sudo: required compiler: gcc - # only use the qt available from homebrew - - os: osx - env: QT_VERSION=5.4.2 - - os: osx - env: QT_VERSION=5.5.1 - # - os: osx - # env: QT_VERSION=5.6 + env: TRAVIS_DIST=precise QT_VERSION=5.4.2 + - os: linux + dist: precise + sudo: required + compiler: gcc + env: TRAVIS_DIST=precise QT_VERSION=5.6.2 + - os: linux + dist: trusty + sudo: required + compiler: gcc + env: TRAVIS_DIST=trusty QT_VERSION=5.4.2 + - os: linux + dist: trusty + sudo: required + compiler: gcc + env: TRAVIS_DIST=trusty QT_VERSION=5.6.2 # Install dependencies install: diff --git a/travis/prepare.sh b/travis/prepare.sh index dc63f0bd..edf9df73 100644 --- a/travis/prepare.sh +++ b/travis/prepare.sh @@ -9,16 +9,20 @@ then echo $QT_WITHOUT_DOTS echo $QT_PKG_PREFIX echo $QT_PKG_INSTALL - sudo add-apt-repository -y ppa:beineri/opt-${QT_WITHOUT_DOTS} + if [ "$TRAVIS_DIST" = "precise" ]; then + sudo add-apt-repository -y ppa:beineri/opt-${QT_WITHOUT_DOTS} + else + sudo add-apt-repository -y ppa:beineri/opt-${QT_WITHOUT_DOTS}-$TRAVIS_DIST + fi sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test # for a recent GCC - sudo add-apt-repository "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main" + sudo add-apt-repository "deb http://llvm.org/apt/${TRAVIS_DIST}/ llvm-toolchain-${TRAVIS_DIST}-3.5 main" sudo apt-get update -qq - sudo apt-get install ${QT_PKG_PREFIX}base ${QT_PKG_PREFIX}svg ${QT_PKG_PREFIX}tools ${QT_PKG_PREFIX}webkit + sudo apt-get install ${QT_PKG_PREFIX}base ${QT_PKG_PREFIX}svg ${QT_PKG_PREFIX}tools sudo mkdir -p /opt/cmake-3/ - wget --no-check-certificate http://www.cmake.org/files/v3.2/cmake-3.2.2-Linux-x86_64.sh - sudo sh cmake-3.2.2-Linux-x86_64.sh --skip-license --prefix=/opt/cmake-3/ + wget --no-check-certificate http://www.cmake.org/files/v3.9/cmake-3.9.3-Linux-x86_64.sh + sudo sh cmake-3.9.3-Linux-x86_64.sh --skip-license --prefix=/opt/cmake-3/ export CMAKE_PREFIX_PATH=/opt/$QT_PKG_INSTALL/lib/cmake export PATH=/opt/cmake-3/bin:/opt/$QT_PKG_INSTALL/bin:$PATH |