From 0ade9f0acb0ed86fdd64abb89d3857a3e4b9ed34 Mon Sep 17 00:00:00 2001 From: Chris Esposito Date: Mon, 18 Oct 2021 21:39:30 +1100 Subject: [PATCH] Swapped to Xenial build machine on Travis --- .travis.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31d22338..69d602c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ branches: matrix: include: - os: linux - dist: trusty + dist: xenial sudo: required compiler: gcc addons: @@ -18,7 +18,9 @@ matrix: - g++-7 - gcc-7 - libfftw3-dev - - libiomp-dev + - libomp-dev + - qt5-default + - libusb-1.0-0-dev env: - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - os: osx @@ -34,8 +36,7 @@ before_install: brew update # Linux elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y - sudo apt-get update -qq || true + sudo apt-get update -qq fi install: @@ -48,11 +49,6 @@ install: brew install fftw #brew install libusb #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: - |