Merge pull request #8856 from mavlink/OSXCodeSign

OSX codesign

Merge pull request #8856 from mavlink/OSXCodeSign
OSX codesign
a525b20b · Don Gagne · GitHub · 7bc15f40 · cae920f1 · a525b20b
Unverified Commit a525b20b authored Jun 21, 2020 by Don Gagne Committed by GitHub Jun 21, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

.travis.yml .travis.yml +8 -4

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -186,10 +186,14 @@ before_script:
    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;
+  - if [[ "${SPEC}" = "macx-clang" ]]; then
+        export CODESIGN=codesign;
+    fi
+  - if [[ "${SPEC}" = "macx-clang" ]]; 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
+        source deploy/MacImportCert.sh;
    fi

 script: