Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
6a56f545
Unverified
Commit
6a56f545
authored
Jan 19, 2019
by
Don Gagne
Committed by
GitHub
Jan 19, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7164 from DonLakeFlyer/LinuxQt5.11.3
Move Linux to Qt 5.11.3
parents
bc0f2f07
193ccf68
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
.travis.yml
.travis.yml
+13
-13
No files found.
.travis.yml
View file @
6a56f545
...
...
@@ -5,7 +5,8 @@ language: cpp
env
:
global
:
-
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
# ANDROID_STOREPASS
-
secure
:
RGovyUnMw3fp/bHZi058JvANT1rYmNqrsuSYew0cIgirO6YbMHr/rsjwCm1FTYpBl8s1zgr+u2b8ftYnfnCz2YT+Aip4NWrVYpVU0FEmfytGILrnUS0pjlt8m7fU9AKR1ElOSll7yw7e1kftynN39Q321etvwbLZcXon6zz0suE=
...
...
@@ -14,12 +15,13 @@ matrix:
fast_finish
:
true
include
:
-
os
:
linux
dist
:
trusty
dist
:
xenial
env
:
SPEC=linux-g++-64 CONFIG=installer
sudo
:
required
-
os
:
linux
dist
:
trusty
dist
:
xenial
env
:
SPEC=linux-g++-64 CONFIG=debug
services
:
xvfb
sudo
:
required
-
os
:
android
language
:
android
...
...
@@ -35,7 +37,7 @@ matrix:
sudo
:
false
# OSX builds pared back to installer only since travis sucks so bad we can't afford more than one'
# - os: osx
# osx_image: xcode
8
# osx_image: xcode
10.1
# env: SPEC=macx-clang CONFIG=debug
# sudo: required
...
...
@@ -48,8 +50,7 @@ android:
addons
:
apt
:
packages
:
-
espeak
-
libespeak-dev
-
speech-dispatcher
-
libgstreamer-plugins-base1.0-dev
-
libgstreamer1.0-0:amd64
-
libgstreamer1.0-dev
...
...
@@ -73,11 +74,9 @@ before_install:
install
:
# linux dependencies: qt
-
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 &&
tar jxf Qt5.11.0-gcc_64-min.tar.bz2 -C /tmp &&
export PATH=/tmp/Qt5.11-gcc_64/5.11.0/gcc_64/bin:$PATH &&
export DISPLAY=:99.0 &&
sh -e /etc/init.d/xvfb start
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.11.3-gcc_64-min.tar.bz2 &&
tar jxf Qt5.11.3-gcc_64-min.tar.bz2 -C /tmp &&
export PATH=/tmp/Qt5.11-gcc_64/5.11.3/gcc_64/bin:$PATH
;
fi
...
...
@@ -164,8 +163,9 @@ script:
# unit tests linux
-
if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then
mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ &&
./debug/qgroundcontrol-start.sh --unittest;
mkdir -p ~/.config/QtProject/ &&
cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ &&
./debug/qgroundcontrol-start.sh --unittest;
fi
after_success
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment