mirror of https://github.com/EspoTek/Labrador.git
Swapped to Xenial build machine on Travis
This commit is contained in:
parent
208acfcfa8
commit
0ade9f0acb
14
.travis.yml
14
.travis.yml
|
@ -7,7 +7,7 @@ branches:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- os: linux
|
- os: linux
|
||||||
dist: trusty
|
dist: xenial
|
||||||
sudo: required
|
sudo: required
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
addons:
|
addons:
|
||||||
|
@ -18,7 +18,9 @@ matrix:
|
||||||
- g++-7
|
- g++-7
|
||||||
- gcc-7
|
- gcc-7
|
||||||
- libfftw3-dev
|
- libfftw3-dev
|
||||||
- libiomp-dev
|
- libomp-dev
|
||||||
|
- qt5-default
|
||||||
|
- libusb-1.0-0-dev
|
||||||
env:
|
env:
|
||||||
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
|
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
|
||||||
- os: osx
|
- os: osx
|
||||||
|
@ -34,8 +36,7 @@ before_install:
|
||||||
brew update
|
brew update
|
||||||
# Linux
|
# Linux
|
||||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||||
sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
|
sudo apt-get update -qq
|
||||||
sudo apt-get update -qq || true
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
install:
|
install:
|
||||||
|
@ -48,11 +49,6 @@ install:
|
||||||
brew install fftw
|
brew install fftw
|
||||||
#brew install libusb
|
#brew install libusb
|
||||||
#brew install wget
|
#brew install wget
|
||||||
# Linux
|
|
||||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
|
||||||
sudo apt-get -y install qt59base libusb-1.0-0-dev
|
|
||||||
source /opt/qt*/bin/qt*-env.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- |
|
- |
|
||||||
|
|
Loading…
Reference in New Issue