From 2f32472544eb9cce8fb5a85d72393f0eeea4a03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulises=20Gasc=C3=B3n?= Date: Sat, 21 Oct 2023 17:54:17 +0200 Subject: [PATCH] tools: drop support for osx notarization with gon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refs: https://github.com/nodejs/build/issues/3385#issuecomment-1729281269 PR-URL: https://github.com/nodejs/node/pull/50291 Reviewed-By: Michaƫl Zasso Reviewed-By: Luigi Pinca Reviewed-By: Yagiz Nizipli Reviewed-By: Richard Lau --- tools/osx-notarize.sh | 79 +++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 52 deletions(-) diff --git a/tools/osx-notarize.sh b/tools/osx-notarize.sh index beea7041793cdf..499bf168b23562 100755 --- a/tools/osx-notarize.sh +++ b/tools/osx-notarize.sh @@ -1,15 +1,12 @@ #!/bin/sh # Notarize a generated node-.pkg file as an Apple requirement for installation on macOS Catalina and later, as validated by Gatekeeper. -# Uses gon (Xcode version < 13.0) or notarytool (Xcode >= 13.0). +# Uses notarytool and requires Xcode >= 13.0. version() { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }' || echo "0" } -xcode_version=$(xcodebuild -version | awk '/Xcode/ {print $2}') -xcode_version_result=$(version "$xcode_version") -xcode_version_threshold=$(version "13.0") pkgid="$1" if [ -z "$pkgid" ]; then @@ -33,55 +30,33 @@ if [ -z "$NOTARIZATION_TEAM_ID" ]; then exit 0 fi -# TODO(@ulisesGascon): remove support for gon -# when https://github.com/nodejs/build/issues/3385#issuecomment-1729281269 is ready -if [ "$xcode_version_result" -lt "$xcode_version_threshold" ]; then - echo "Notarization process is done with gon." - set -x - - gon_version="0.2.2" - gon_exe="${HOME}/.gon/gon_${gon_version}" - - mkdir -p "${HOME}/.gon/" - - if [ ! -f "${gon_exe}" ]; then - curl -sL "https://github.com/mitchellh/gon/releases/download/v${gon_version}/gon_${gon_version}_macos.zip" -o "${gon_exe}.zip" - (cd "${HOME}/.gon/" && rm -f gon && unzip "${gon_exe}.zip" && mv gon "${gon_exe}") - fi +echo "Notarization process is done with Notarytool." - sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" tools/osx-gon-config.json.tmpl \ - > gon-config.json - - "${gon_exe}" -log-level=info gon-config.json +if ! command -v xcrun notarytool > /dev/null +then + echo "Notarytool is not present in the system. Notarization has failed." + exit 1 +fi +# Submit the package for notarization +# TODO(@ulisesGascon): refactor to use --keychain-profile +# when https://github.com/nodejs/build/issues/3385#issuecomment-1729281269 is ready +notarization_output=$( + xcrun notarytool submit \ + --apple-id "$NOTARIZATION_ID" \ + --password "$NOTARIZATION_PASSWORD" \ + --team-id "$NOTARIZATION_TEAM_ID" \ + --wait \ + "node-$pkgid.pkg" 2>&1 +) + +if [ $? -eq 0 ]; then + # Extract the operation ID from the output + operation_id=$(echo "$notarization_output" | awk '/RequestUUID/ {print $NF}') + echo "Notarization submitted. Operation ID: $operation_id" + exit 0 else - echo "Notarization process is done with Notarytool." - - if ! command -v xcrun notarytool > /dev/null - then - echo "Notarytool is not present in the system. Notarization has failed." - exit 1 - fi - - # Submit the package for notarization - # TODO(@ulisesGascon): refactor to use --keychain-profile - # when https://github.com/nodejs/build/issues/3385#issuecomment-1729281269 is ready - notarization_output=$( - xcrun notarytool submit \ - --apple-id "$NOTARIZATION_ID" \ - --password "$NOTARIZATION_PASSWORD" \ - --team-id "$NOTARIZATION_TEAM_ID" \ - --wait \ - "node-$pkgid.pkg" 2>&1 - ) - - if [ $? -eq 0 ]; then - # Extract the operation ID from the output - operation_id=$(echo "$notarization_output" | awk '/RequestUUID/ {print $NF}') - echo "Notarization submitted. Operation ID: $operation_id" - exit 0 - else - echo "Notarization failed. Error: $notarization_output" - exit 1 - fi + echo "Notarization failed. Error: $notarization_output" + exit 1 fi +