From e974e22d99703a4e3838229bc07be88c7acfadc5 Mon Sep 17 00:00:00 2001 From: Peter Squicciarini Date: Mon, 14 Sep 2020 11:17:53 -0700 Subject: [PATCH] (experiment) disable mac signing --- build.sh | 13 +------------ sign_mac_app.sh | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/build.sh b/build.sh index f7e2e74..d31cded 100755 --- a/build.sh +++ b/build.sh @@ -2,13 +2,6 @@ set -ex -function keep_alive_small() { - while true; do - echo . - read -t 60 < /proc/self/fd/1 > /dev/null 2>&1 - done -} - function keep_alive() { while true; do date @@ -29,11 +22,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then cd vscode || exit # these tasks are very slow, so using a keep alive to keep travis alive - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - keep_alive_small & - else - keep_alive & - fi + keep_alive & KA_PID=$! diff --git a/sign_mac_app.sh b/sign_mac_app.sh index 1f3032a..11669b9 100755 --- a/sign_mac_app.sh +++ b/sign_mac_app.sh @@ -2,22 +2,22 @@ # thanks to https://www.jviotti.com/2016/03/16/how-to-code-sign-os-x-electron-apps-in-travis-ci.html # for the helpful instructions -if [[ "$SHOULD_BUILD" == "yes" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [ -d "VSCode-darwin" ]; then # just in case the build failed - cd VSCode-darwin - export CERTIFICATE_P12=VSCodium.p12 - echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12 - export KEYCHAIN=build.keychain - security create-keychain -p mysecretpassword $KEYCHAIN - security default-keychain -s $KEYCHAIN - security unlock-keychain -p mysecretpassword $KEYCHAIN - security import $CERTIFICATE_P12 -k $KEYCHAIN -P $CERTIFICATE_OSX_PASSWORD -T /usr/bin/codesign - - # https://docs.travis-ci.com/user/common-build-problems/ - security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN - - codesign --deep --force --verbose --sign "$CERTIFICATE_OSX_ID" VSCodium.app - fi - fi -fi +# if [[ "$SHOULD_BUILD" == "yes" ]]; then +# if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then +# if [ -d "VSCode-darwin" ]; then # just in case the build failed +# cd VSCode-darwin +# export CERTIFICATE_P12=VSCodium.p12 +# echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12 +# export KEYCHAIN=build.keychain +# security create-keychain -p mysecretpassword $KEYCHAIN +# security default-keychain -s $KEYCHAIN +# security unlock-keychain -p mysecretpassword $KEYCHAIN +# security import $CERTIFICATE_P12 -k $KEYCHAIN -P $CERTIFICATE_OSX_PASSWORD -T /usr/bin/codesign +# +# # https://docs.travis-ci.com/user/common-build-problems/ +# security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN +# +# codesign --deep --force --verbose --sign "$CERTIFICATE_OSX_ID" VSCodium.app +# fi +# fi +# fi