Skip to content

Commit 61d94be

Browse files
committed
[macOS] Use notarytool instead of deprecated altool.
1 parent e3827e1 commit 61d94be

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

build-release.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,11 @@ sign_macos() {
4848
-s ${OSX_KEY_ID} -v ${_appname} && \
4949
zip -r ${_binname}_signed.zip ${_appname}"
5050

51-
_request_uuid=$(ssh "${OSX_HOST}" "xcrun altool --notarize-app --primary-bundle-id \"${OSX_BUNDLE_ID}\" --username \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" --file ${_macos_tmpdir}/${_binname}_signed.zip")
52-
_request_uuid=$(echo ${_request_uuid} | sed -e 's/.*RequestUUID = //')
53-
ssh "${OSX_HOST}" "while xcrun altool --notarization-info ${_request_uuid} -u \"${APPLE_ID}\" -p \"${APPLE_ID_PASSWORD}\" | grep -q Status:\ in\ progress; do echo Waiting on Apple notarization...; sleep 30s; done"
54-
if ! ssh "${OSX_HOST}" "xcrun altool --notarization-info ${_request_uuid} -u \"${APPLE_ID}\" -p \"${APPLE_ID_PASSWORD}\" | grep -q Status:\ success"; then
51+
_request_uuid=$(ssh "${OSX_HOST}" "xcrun notarytool submit ${_macos_tmpdir}/${_binname}_signed.zip --team-id \"${APPLE_TEAM}\" --apple-id \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" --no-progress")
52+
_request_uuid=$(echo ${_request_uuid} | grep 'id:' | sed -e 's/.*id: //')
53+
if ! ssh "${OSX_HOST}" "xcrun notarytool wait ${_request_uuid} --team-id \"${APPLE_TEAM}\" --apple-id \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\" | grep -q status:\ Accepted"; then
5554
echo "Notarization failed."
56-
_notarization_log=$(ssh "${OSX_HOST}" "xcrun altool --notarization-info ${_request_uuid} -u \"${APPLE_ID}\" -p \"${APPLE_ID_PASSWORD}\"")
55+
_notarization_log=$(ssh "${OSX_HOST}" "xcrun notarytool log ${_request_uuid} --team-id \"${APPLE_TEAM}\" --apple-id \"${APPLE_ID}\" --password \"${APPLE_ID_PASSWORD}\"")
5756
echo "${_notarization_log}"
5857
ssh "${OSX_HOST}" "rm -rf ${_macos_tmpdir}"
5958
exit 1

config.sh.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ export OSX_HOST=""
3838
export OSX_KEY_ID=""
3939
# Bundle id for the signed app
4040
export OSX_BUNDLE_ID=""
41-
# Username/password for Apple's signing APIs (used for atltool)
41+
# Username/password for Apple's signing APIs (used for notarytool)
42+
export APPLE_TEAM=""
4243
export APPLE_ID=""
4344
export APPLE_ID_PASSWORD=""
4445

0 commit comments

Comments
 (0)