Commit debe444e authored by Don Gagne's avatar Don Gagne

parent b12e2d99
...@@ -5,10 +5,8 @@ language: cpp ...@@ -5,10 +5,8 @@ language: cpp
env: env:
global: global:
- JOBS=4 - JOBS=4
# 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 - CODESIGN=nocodesign
- secure: RGovyUnMw3fp/bHZi058JvANT1rYmNqrsuSYew0cIgirO6YbMHr/rsjwCm1FTYpBl8s1zgr+u2b8ftYnfnCz2YT+Aip4NWrVYpVU0FEmfytGILrnUS0pjlt8m7fU9AKR1ElOSll7yw7e1kftynN39Q321etvwbLZcXon6zz0suE= - secure: RGovyUnMw3fp/bHZi058JvANT1rYmNqrsuSYew0cIgirO6YbMHr/rsjwCm1FTYpBl8s1zgr+u2b8ftYnfnCz2YT+Aip4NWrVYpVU0FEmfytGILrnUS0pjlt8m7fU9AKR1ElOSll7yw7e1kftynN39Q321etvwbLZcXon6zz0suE=
jobs: jobs:
...@@ -188,7 +186,8 @@ before_script: ...@@ -188,7 +186,8 @@ before_script:
fi fi
# Install signing cert into OSX keychain # Install signing cert into OSX keychain
- if [[ "${SPEC}" = "macx-clang" ]]; then - if [[ "${SPEC}" = "macx-clang" && "${TRAVIS_PULL_REQUEST}" = "false" ]]; then
export CODESIGN=codesign &&
openssl aes-256-cbc -K $MAC_CERT_KEY -iv $MAC_CERT_IV -in deploy/MacCertificates.p12.enc -out deploy/MacCertificates.p12 -d && openssl aes-256-cbc -K $MAC_CERT_KEY -iv $MAC_CERT_IV -in deploy/MacCertificates.p12.enc -out deploy/MacCertificates.p12 -d &&
./deploy/MacImportCert.sh; ./deploy/MacImportCert.sh;
fi fi
...@@ -203,7 +202,7 @@ script: ...@@ -203,7 +202,7 @@ script:
echo "Daily build" && echo "Daily build" &&
export STABLE_OR_DAILY=DailyBuild; export STABLE_OR_DAILY=DailyBuild;
fi fi
- qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=${STABLE_OR_DAILY} CONFIG+=codesign -spec ${SPEC}; - qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=${STABLE_OR_DAILY} CONFIG+=${CODESIGN} -spec ${SPEC};
# compile # compile
- if [ "${SPEC}" != "macx-ios-clang" ]; then - if [ "${SPEC}" != "macx-ios-clang" ]; then
......
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