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
7bc15f40
Unverified
Commit
7bc15f40
authored
Jun 21, 2020
by
Don Gagne
Committed by
GitHub
Jun 21, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8855 from DonLakeFlyer/OSXCodeSign
Sign OSX builds
parents
1dd37d9d
debe444e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
4 deletions
+23
-4
.travis.yml
.travis.yml
+9
-4
QGCPostLinkInstaller.pri
QGCPostLinkInstaller.pri
+5
-0
MacCertificates.p12.enc
deploy/MacCertificates.p12.enc
+0
-0
MacImportCert.sh
deploy/MacImportCert.sh
+9
-0
No files found.
.travis.yml
View file @
7bc15f40
...
...
@@ -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:
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:
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
...
...
QGCPostLinkInstaller.pri
View file @
7bc15f40
...
...
@@ -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
...
...
deploy/MacCertificates.p12.enc
0 → 100644
View file @
7bc15f40
File added
deploy/MacImportCert.sh
0 → 100644
View file @
7bc15f40
#!/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
\ No newline at end of file
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