Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qgroundcontrol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Valentin Platzgummer
qgroundcontrol
Commits
c2dcb35d
Unverified
Commit
c2dcb35d
authored
7 years ago
by
Don Gagne
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #5984 from DonLakeFlyer/iOSTravis
WIP: Try turning iOS back on in Travis
parents
c90bc0bd
300631dc
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.travis.yml
+8
-9
8 additions, 9 deletions
.travis.yml
with
8 additions
and
9 deletions
.travis.yml
+
8
−
9
View file @
c2dcb35d
...
...
@@ -29,15 +29,15 @@ matrix:
osx_image
:
xcode9.2
env
:
SPEC=macx-clang CONFIG=installer
sudo
:
required
-
os
:
osx
osx_image
:
xcode8
env
:
SPEC=macx-ios-clang CONFIG=release
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: xcode8
# env: SPEC=macx-clang CONFIG=debug
# sudo: required
# - os: osx
# osx_image: xcode8
# env: SPEC=macx-ios-clang CONFIG=release
# sudo: false
android
:
components
:
...
...
@@ -130,14 +130,13 @@ install:
;
fi
# ios dependencies: qt
, TODO: add gstreamer
# ios dependencies: qt
-
if [ "${SPEC}" = "macx-ios-clang" ]; then
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
8.0
-ios-min.tar.bz2 &&
tar jxf Qt5.
8.0
-ios-min.tar.bz2 -C /tmp &&
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
9.3
-ios-min.tar.bz2 &&
tar jxf Qt5.
9.3
-ios-min.tar.bz2 -C /tmp &&
export IOS_CCACHE_CC=`/usr/bin/xcrun -sdk iphoneos -find clang` &&
export IOS_CCACHE_CXX=`/usr/bin/xcrun -sdk iphoneos -find clang++` &&
export PATH=/tmp/Qt5.8-ios/5.8/ios/bin:$PATH &&
tools/patch_qt_for_xcode8.sh
export PATH=/tmp/Qt5.9-ios/5.9.3/ios/bin:$PATH
;
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment