Permalink
Browse files

NOISSUE force travis.ci to use precise, fix ppa for Qt

  • Loading branch information...
peterix committed Sep 25, 2017
1 parent f8c5cee commit afcbdee7a7b8beaa11ca982dcf6e8781e00bb6ba
Showing with 13 additions and 23 deletions.
  1. +10 −21 .travis.yml
  2. +3 −2 travis/prepare.sh
View
@@ -2,29 +2,18 @@
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.5.1
# Install dependencies
install:
View
@@ -1,4 +1,5 @@
set -e
set -x
if [ "$TRAVIS_OS_NAME" = "linux" ]
then
@@ -9,9 +10,9 @@ then
echo $QT_WITHOUT_DOTS
echo $QT_PKG_PREFIX
echo $QT_PKG_INSTALL
sudo add-apt-repository -y ppa:beineri/opt-${QT_WITHOUT_DOTS}
sudo add-apt-repository -y ppa:beineri/opt-${QT_WITHOUT_DOTS}-${TRAVIS_DIST}
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

0 comments on commit afcbdee

Please sign in to comment.