Unverified Commit 4c205b11 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #8857 from DonLakeFlyer/CodeSignOff

Code signing off for now
parents a525b20b ace951d8
...@@ -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
......
...@@ -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
......
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