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
4c205b11
Unverified
Commit
4c205b11
authored
Jun 22, 2020
by
Don Gagne
Committed by
GitHub
Jun 22, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8857 from DonLakeFlyer/CodeSignOff
Code signing off for now
parents
a525b20b
ace951d8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
.travis.yml
.travis.yml
+3
-3
QGCPostLinkInstaller.pri
QGCPostLinkInstaller.pri
+3
-2
No files found.
.travis.yml
View file @
4c205b11
...
@@ -186,13 +186,13 @@ before_script:
...
@@ -186,13 +186,13 @@ 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;
export CODESIGN=codesign;
fi
fi
-
if [[ "${SPEC}" = "macx-clang" ]]; then
-
if [[ "${SPEC}" = "macx-clang"
&& "${TRAVIS_PULL_REQUEST}" = "false"
]]; then
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;
fi
fi
-
if [[ "${SPEC}" = "macx-clang" ]]; then
-
if [[ "${SPEC}" = "macx-clang"
&& "${TRAVIS_PULL_REQUEST}" = "false"
]]; then
source deploy/MacImportCert.sh;
source deploy/MacImportCert.sh;
fi
fi
...
...
QGCPostLinkInstaller.pri
View file @
4c205b11
...
@@ -32,8 +32,9 @@ installer {
...
@@ -32,8 +32,9 @@ installer {
QMAKE_POST_LINK += && python $$SOURCE_DIR/tools/osxrelocator.py $${TARGET}.app/Contents @rpath @executable_path/../Frameworks -r > /dev/null 2>&1
QMAKE_POST_LINK += && python $$SOURCE_DIR/tools/osxrelocator.py $${TARGET}.app/Contents @rpath @executable_path/../Frameworks -r > /dev/null 2>&1
codesign {
codesign {
QMAKE_POST_LINK += && echo codesign
# Disabled for now since it's not working correctly yet
QMAKE_POST_LINK += && codesign --deep $${TARGET}.app -s WQREC9W69J
#QMAKE_POST_LINK += && echo codesign
#QMAKE_POST_LINK += && codesign --deep $${TARGET}.app -s WQREC9W69J
}
}
# Create package
# Create package
...
...
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