Commit 474230af authored by Daniel Agar's avatar Daniel Agar

travis-ci explicitly set spec

parent cf1dde16
...@@ -8,15 +8,15 @@ git: ...@@ -8,15 +8,15 @@ git:
matrix: matrix:
include: include:
- os: linux - os: linux
env: CONFIG=release env: SPEC=linux-g++-64 CONFIG=debug
- os: linux - os: linux
env: CONFIG=debug env: SPEC=linux-g++-64 CONFIG=release
- os: osx - os: osx
osx_image: beta-xcode6.3 osx_image: beta-xcode6.3
env: CONFIG=release env: SPEC=macx-clang CONFIG=debug
- os: osx - os: osx
osx_image: beta-xcode6.3 osx_image: beta-xcode6.3
env: CONFIG=debug env: SPEC=macx-clang CONFIG=release
cache: cache:
- apt - apt
...@@ -50,7 +50,7 @@ install: ...@@ -50,7 +50,7 @@ install:
fi fi
before_script: qmake CONFIG+=${CONFIG} -r qgroundcontrol.pro before_script: qmake -r qgroundcontrol.pro CONFIG+=${CONFIG} -spec ${SPEC}
script: script:
- echo 'Building QGroundControl' && echo -en 'travis_fold:start:script.1\\r' - echo 'Building QGroundControl' && echo -en 'travis_fold:start:script.1\\r'
- make -j4 - make -j4
......
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