Browse Source

Merge pull request #8855 from DonLakeFlyer/OSXCodeSign

Sign OSX builds
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
7bc15f401b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      .travis.yml
  2. 5
      QGCPostLinkInstaller.pri
  3. BIN
      deploy/MacCertificates.p12.enc
  4. 9
      deploy/MacImportCert.sh

13
.travis.yml

@ -5,10 +5,8 @@ language: cpp @@ -5,10 +5,8 @@ language: cpp
env:
global:
- 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
# ANDROID_STOREPASS
- CODESIGN=nocodesign
- secure: RGovyUnMw3fp/bHZi058JvANT1rYmNqrsuSYew0cIgirO6YbMHr/rsjwCm1FTYpBl8s1zgr+u2b8ftYnfnCz2YT+Aip4NWrVYpVU0FEmfytGILrnUS0pjlt8m7fU9AKR1ElOSll7yw7e1kftynN39Q321etvwbLZcXon6zz0suE=
jobs:
@ -186,6 +184,13 @@ before_script: @@ -186,6 +184,13 @@ before_script:
git fetch --tags origin master &&
./tools/update_android_version.sh ${BITNESS} ${TRAVIS_BRANCH};
fi
# Install signing cert into OSX keychain
- 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 &&
./deploy/MacImportCert.sh;
fi
script:
# run qmake
@ -197,7 +202,7 @@ script: @@ -197,7 +202,7 @@ script:
echo "Daily build" &&
export STABLE_OR_DAILY=DailyBuild;
fi
- qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=${STABLE_OR_DAILY} -spec ${SPEC};
- qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=${STABLE_OR_DAILY} CONFIG+=${CODESIGN} -spec ${SPEC};
# compile
- if [ "${SPEC}" != "macx-ios-clang" ]; then

5
QGCPostLinkInstaller.pri

@ -31,6 +31,11 @@ installer { @@ -31,6 +31,11 @@ installer {
QMAKE_POST_LINK += && echo osxrelocator
QMAKE_POST_LINK += && python $$SOURCE_DIR/tools/osxrelocator.py $${TARGET}.app/Contents @rpath @executable_path/../Frameworks -r > /dev/null 2>&1
codesign {
QMAKE_POST_LINK += && echo codesign
QMAKE_POST_LINK += && codesign --deep $${TARGET}.app -s WQREC9W69J
}
# Create package
QMAKE_POST_LINK += && echo hdiutil
QMAKE_POST_LINK += && mkdir -p package

BIN
deploy/MacCertificates.p12.enc

Binary file not shown.

9
deploy/MacImportCert.sh

@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
#!/bin/sh
KEY_CHAIN=mac-travis-build.keychain
security create-keychain -p travis $KEY_CHAIN
security default-keychain -s $KEY_CHAIN
security unlock-keychain -p travis $KEY_CHAIN
security set-keychain-settings -t 3600 -u $KEY_CHAIN
security import deploy/MacCertificates.p12 -k $KEY_CHAIN -P $MAC_CERT_PASSWORD -T /usr/bin/codesign
security set-key-partition-list -S apple-tool:,apple: -s -k travis $KEY_CHAIN
security list-keychains -s $KEY_CHAIN
Loading…
Cancel
Save