Linuxy bits put back in travis.yml

This commit is contained in:
chrises 2021-10-28 15:42:48 +11:00
parent 5f7c56d222
commit 626691d815
1 changed files with 9 additions and 4 deletions

View File

@ -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:
@ -17,6 +17,10 @@ matrix:
packages: packages:
- g++-7 - g++-7
- gcc-7 - gcc-7
- libfftw3-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
@ -32,8 +36,8 @@ 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 add-apt-repository ppa:beineri/opt-qt-5.12.9-xenial -y
sudo apt-get update -qq || true sudo apt-get update -qq
fi fi
install: install:
@ -46,7 +50,7 @@ install:
#brew install wget #brew install wget
# Linux # Linux
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 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 source /opt/qt*/bin/qt*-env.sh
fi fi
@ -84,6 +88,7 @@ after_success:
find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq 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" 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 wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
bash upload.sh EspoTek_Labrador*.AppImage
fi fi
branches: branches: