From c13b6df0a77c4b56dc0a714208783f95bc4f4011 Mon Sep 17 00:00:00 2001 From: Sudarsan Reddy Date: Mon, 12 Dec 2022 11:08:15 +0000 Subject: [PATCH] TUN-7003: Tempoarily disable erroneous notarize-app This PR temporarily disables the xcrun notarize-app feature since this is soemthing we've historically had broken. However, what changed now is we set -e for the mac os scripts. We'll need to remove this to unblock mac builds. We could spend time as part of https://jira.cfdata.org/browse/TUN-5789 to look into this. --- .teamcity/build-macos.sh | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.teamcity/build-macos.sh b/.teamcity/build-macos.sh index 0770df58..15c773af 100755 --- a/.teamcity/build-macos.sh +++ b/.teamcity/build-macos.sh @@ -142,13 +142,8 @@ fi if [[ ! -z "$CODE_SIGN_NAME" ]]; then codesign -s "${CODE_SIGN_NAME}" -f -v --timestamp --options runtime ${BINARY_NAME} - # notarize the binary - if [[ ! -z "$CFD_NOTE_PASSWORD" ]]; then - zip "${BINARY_NAME}.zip" ${BINARY_NAME} - xcrun altool --notarize-app -f "${BINARY_NAME}.zip" -t osx -u ${CFD_NOTE_USERNAME} -p ${CFD_NOTE_PASSWORD} --primary-bundle-id ${BUNDLE_ID} - fi -fi - + # notarize the binary + # TODO: https://jira.cfdata.org/browse/TUN-5789 # creating build directory rm -rf $TARGET_DIRECTORY @@ -173,10 +168,7 @@ if [[ ! -z "$PKG_SIGN_NAME" ]]; then ${PKGNAME} # notarize the package - if [[ ! -z "$CFD_NOTE_PASSWORD" ]]; then - xcrun altool --notarize-app -f ${PKGNAME} -t osx -u ${CFD_NOTE_USERNAME} -p ${CFD_NOTE_PASSWORD} --primary-bundle-id ${BUNDLE_ID} - xcrun stapler staple ${PKGNAME} - fi + # TODO: https://jira.cfdata.org/browse/TUN-5789 else pkgbuild --identifier com.cloudflare.${PRODUCT} \ --version ${VERSION} \