From 5b73b56cbda7281c97b0277551872f3261446b51 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Mon, 22 Jun 2020 12:33:41 -0700
Subject: [PATCH 1/2] Code signing off for now

---
 QGCPostLinkInstaller.pri | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/QGCPostLinkInstaller.pri b/QGCPostLinkInstaller.pri
index 1acf8de..da1eb6e 100644
--- a/QGCPostLinkInstaller.pri
+++ b/QGCPostLinkInstaller.pri
@@ -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
 
         codesign {
-            QMAKE_POST_LINK += && echo codesign
-            QMAKE_POST_LINK += && codesign --deep $${TARGET}.app -s WQREC9W69J
+            # Disabled for now since it's not working correctly yet
+            #QMAKE_POST_LINK += && echo codesign
+            #QMAKE_POST_LINK += && codesign --deep $${TARGET}.app -s WQREC9W69J
         }
 
         # Create package

From ace951d8a0457ec1d6aa9cedb8a069e2d87dfe8e Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Mon, 22 Jun 2020 13:19:58 -0700
Subject: [PATCH 2/2] Manage cert only on master merge

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 30dee4d..fafa9fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -186,13 +186,13 @@ before_script:
     fi
     
   # Install signing cert into OSX keychain
-  - if [[ "${SPEC}" = "macx-clang" ]]; then
+  - if [[ "${SPEC}" = "macx-clang" && "${TRAVIS_PULL_REQUEST}" = "false" ]]; then
         export CODESIGN=codesign;
     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;
     fi
-  - if [[ "${SPEC}" = "macx-clang" ]]; then
+  - if [[ "${SPEC}" = "macx-clang" && "${TRAVIS_PULL_REQUEST}" = "false" ]]; then
         source deploy/MacImportCert.sh;
     fi