From 626691d81590160e6954a430262a9cff53fe3cbc Mon Sep 17 00:00:00 2001 From: chrises Date: Thu, 28 Oct 2021 15:42:48 +1100 Subject: [PATCH] Linuxy bits put back in travis.yml --- .travis.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a83baff..2a35d395 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: @@ -17,6 +17,10 @@ matrix: packages: - g++-7 - gcc-7 + - libfftw3-dev + - libomp-dev + - qt5-default + - libusb-1.0-0-dev env: - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - os: osx @@ -32,8 +36,8 @@ 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 add-apt-repository ppa:beineri/opt-qt-5.12.9-xenial -y + sudo apt-get update -qq fi install: @@ -46,7 +50,7 @@ install: #brew install wget # Linux elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - sudo apt-get -y install qt59base libusb-1.0-0-dev + sudo apt-get -y install qt512base source /opt/qt*/bin/qt*-env.sh fi @@ -84,6 +88,7 @@ after_success: find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq export UPLOADTOOL_BODY="EspoTek Labrador software for Linux. This should be compatible with all modern 64-bit distros. If you need help building it on an older or 32-bit system, please contact admin@espotek.com" wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh + bash upload.sh EspoTek_Labrador*.AppImage fi branches: