From 042257a55cae1e027d3ca1e4bf64a1828ca9f375 Mon Sep 17 00:00:00 2001 From: Dylan Weremeichik Date: Fri, 28 Jul 2017 23:21:42 -0400 Subject: [PATCH 1/2] Disabled signing on PRs due to travis' secruity policy. --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d03e01c6c..7dd6174ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,21 +28,24 @@ matrix: env: NODE_VERSION=6.9 CC=clang CXX=clang++ SIGN_BUILD=true DEBUG="electron-packager:*" INSTALL_TARGET=client before_install: -- openssl aes-256-cbc -K $encrypted_1670798fb6bd_key -iv $encrypted_1670798fb6bd_iv +- if [ ${TRAVIS_PULL_REQUEST} = "false" ]; then openssl aes-256-cbc -K $encrypted_1670798fb6bd_key -iv $encrypted_1670798fb6bd_iv -in ~/build/nylas-mail-lives/nylas-mail/certs/nml.p12.enc -out ~/build/nylas-mail-lives/nylas-mail/certs/nml.p12 -d + fi install: - git clone https://github.com/creationix/nvm.git /tmp/.nvm - source /tmp/.nvm/nvm.sh - nvm install $NODE_VERSION - nvm use --delete-prefix $NODE_VERSION before_script: -- if [ ${TRAVIS_OS_NAME} = "osx" ]; then security delete-keychain nml-build.keychain; +- if [ ${TRAVIS_OS_NAME} = "osx" ] && [ ${TRAVIS_PULL_REQUEST} = "false" ]; then security delete-keychain nml-build.keychain; security create-keychain -p travis nml-build.keychain; security default-keychain -s nml-build.keychain; security unlock-keychain -p travis nml-build.keychain; security import ~/build/nylas-mail-lives/nylas-mail/certs/AppleWWDRCA.cer -k ~/Library/Keychains/nml-build.keychain -T /usr/bin/codesign; security import ~/build/nylas-mail-lives/nylas-mail/certs/nml.cer -k ~/Library/Keychains/nml-build.keychain -T /usr/bin/codesign; security import ~/build/nylas-mail-lives/nylas-mail/certs/nml.p12 -k ~/Library/Keychains/nml-build.keychain -P $NML_CERTIFICATE_PASSWORD -T /usr/bin/codesign; + else + SIGN_BUILD=false fi script: - npm install && npm run build-client From c3ca1307fbde53f4019be10f1d1a5016b2580f38 Mon Sep 17 00:00:00 2001 From: Dylan Weremeichik Date: Fri, 28 Jul 2017 23:30:37 -0400 Subject: [PATCH 2/2] Added semi-colons to make the travis gods happy. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7dd6174ab..6fe559d72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ matrix: INSTALL_TARGET=client before_install: - if [ ${TRAVIS_PULL_REQUEST} = "false" ]; then openssl aes-256-cbc -K $encrypted_1670798fb6bd_key -iv $encrypted_1670798fb6bd_iv - -in ~/build/nylas-mail-lives/nylas-mail/certs/nml.p12.enc -out ~/build/nylas-mail-lives/nylas-mail/certs/nml.p12 -d + -in ~/build/nylas-mail-lives/nylas-mail/certs/nml.p12.enc -out ~/build/nylas-mail-lives/nylas-mail/certs/nml.p12 -d; fi install: - git clone https://github.com/creationix/nvm.git /tmp/.nvm @@ -45,7 +45,7 @@ before_script: ~/Library/Keychains/nml-build.keychain -T /usr/bin/codesign; security import ~/build/nylas-mail-lives/nylas-mail/certs/nml.p12 -k ~/Library/Keychains/nml-build.keychain -P $NML_CERTIFICATE_PASSWORD -T /usr/bin/codesign; else - SIGN_BUILD=false + SIGN_BUILD=false; fi script: - npm install && npm run build-client