Unverified Commit 6a56f545 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #7164 from DonLakeFlyer/LinuxQt5.11.3

Move Linux to Qt 5.11.3
parents bc0f2f07 193ccf68
...@@ -5,7 +5,8 @@ language: cpp ...@@ -5,7 +5,8 @@ language: cpp
env: env:
global: global:
- JOBS=4 - JOBS=4
- QT_FATAL_WARNINGS=1 # QT_FATAL_WARNINGS is turned off because Qt 5.11.3 throws a speech dispatcher not working warning when running unit tests
#- QT_FATAL_WARNINGS=1
- SHADOW_BUILD_DIR=/tmp/shadow_build_dir - SHADOW_BUILD_DIR=/tmp/shadow_build_dir
# ANDROID_STOREPASS # ANDROID_STOREPASS
- secure: RGovyUnMw3fp/bHZi058JvANT1rYmNqrsuSYew0cIgirO6YbMHr/rsjwCm1FTYpBl8s1zgr+u2b8ftYnfnCz2YT+Aip4NWrVYpVU0FEmfytGILrnUS0pjlt8m7fU9AKR1ElOSll7yw7e1kftynN39Q321etvwbLZcXon6zz0suE= - secure: RGovyUnMw3fp/bHZi058JvANT1rYmNqrsuSYew0cIgirO6YbMHr/rsjwCm1FTYpBl8s1zgr+u2b8ftYnfnCz2YT+Aip4NWrVYpVU0FEmfytGILrnUS0pjlt8m7fU9AKR1ElOSll7yw7e1kftynN39Q321etvwbLZcXon6zz0suE=
...@@ -14,12 +15,13 @@ matrix: ...@@ -14,12 +15,13 @@ matrix:
fast_finish: true fast_finish: true
include: include:
- os: linux - os: linux
dist: trusty dist: xenial
env: SPEC=linux-g++-64 CONFIG=installer env: SPEC=linux-g++-64 CONFIG=installer
sudo: required sudo: required
- os: linux - os: linux
dist: trusty dist: xenial
env: SPEC=linux-g++-64 CONFIG=debug env: SPEC=linux-g++-64 CONFIG=debug
services: xvfb
sudo: required sudo: required
- os: android - os: android
language: android language: android
...@@ -35,7 +37,7 @@ matrix: ...@@ -35,7 +37,7 @@ matrix:
sudo: false sudo: false
# OSX builds pared back to installer only since travis sucks so bad we can't afford more than one' # OSX builds pared back to installer only since travis sucks so bad we can't afford more than one'
# - os: osx # - os: osx
# osx_image: xcode8 # osx_image: xcode10.1
# env: SPEC=macx-clang CONFIG=debug # env: SPEC=macx-clang CONFIG=debug
# sudo: required # sudo: required
...@@ -48,8 +50,7 @@ android: ...@@ -48,8 +50,7 @@ android:
addons: addons:
apt: apt:
packages: packages:
- espeak - speech-dispatcher
- libespeak-dev
- libgstreamer-plugins-base1.0-dev - libgstreamer-plugins-base1.0-dev
- libgstreamer1.0-0:amd64 - libgstreamer1.0-0:amd64
- libgstreamer1.0-dev - libgstreamer1.0-dev
...@@ -73,11 +74,9 @@ before_install: ...@@ -73,11 +74,9 @@ before_install:
install: install:
# linux dependencies: qt # linux dependencies: qt
- if [ "${SPEC}" = "linux-g++-64" ]; then - if [ "${SPEC}" = "linux-g++-64" ]; then
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.11.0-gcc_64-min.tar.bz2 && wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.11.3-gcc_64-min.tar.bz2 &&
tar jxf Qt5.11.0-gcc_64-min.tar.bz2 -C /tmp && tar jxf Qt5.11.3-gcc_64-min.tar.bz2 -C /tmp &&
export PATH=/tmp/Qt5.11-gcc_64/5.11.0/gcc_64/bin:$PATH && export PATH=/tmp/Qt5.11-gcc_64/5.11.3/gcc_64/bin:$PATH
export DISPLAY=:99.0 &&
sh -e /etc/init.d/xvfb start
; ;
fi fi
...@@ -164,8 +163,9 @@ script: ...@@ -164,8 +163,9 @@ script:
# unit tests linux # unit tests linux
- if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then - if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then
mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ && mkdir -p ~/.config/QtProject/ &&
./debug/qgroundcontrol-start.sh --unittest; cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ &&
./debug/qgroundcontrol-start.sh --unittest;
fi fi
after_success: after_success:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment