File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -49,12 +49,11 @@ sign_macos() {
49
49
-s ${OSX_KEY_ID} -v ${_appname} && \
50
50
zip -r ${_binname} _signed.zip ${_appname} "
51
51
52
- _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" )
53
- _request_uuid=$( echo ${_request_uuid} | sed -e ' s/.*RequestUUID = //' )
54
- 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"
55
- if ! ssh " ${OSX_HOST} " " xcrun altool --notarization-info ${_request_uuid} -u \" ${APPLE_ID} \" -p \" ${APPLE_ID_PASSWORD} \" | grep -q Status:\ success" ; then
52
+ _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 --output-format json" )
53
+ _request_uuid=$( echo ${_request_uuid} | sed -e ' s/.*"id":"\([^"]*\)".*/\1/' )
54
+ 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
56
55
echo " Notarization failed."
57
- _notarization_log=$( ssh " ${OSX_HOST} " " xcrun altool --notarization-info ${_request_uuid} -u \" ${APPLE_ID} \" -p \" ${APPLE_ID_PASSWORD} \" " )
56
+ _notarization_log=$( ssh " ${OSX_HOST} " " xcrun notarytool log ${_request_uuid} --team-id \" ${APPLE_TEAM} \" --apple-id \" ${APPLE_ID} \" --password \" ${APPLE_ID_PASSWORD} \" " )
58
57
echo " ${_notarization_log} "
59
58
ssh " ${OSX_HOST} " " rm -rf ${_macos_tmpdir} "
60
59
exit 1
Original file line number Diff line number Diff line change @@ -50,7 +50,8 @@ export OSX_HOST=''
50
50
export OSX_KEY_ID=' '
51
51
# Bundle id for the signed app
52
52
export OSX_BUNDLE_ID=' '
53
- # Username/password for Apple's signing APIs (used for atltool)
53
+ # Username/password for Apple's signing APIs (used for notarytool)
54
+ export APPLE_TEAM=' '
54
55
export APPLE_ID=' '
55
56
export APPLE_ID_PASSWORD=' '
56
57
You can’t perform that action at this time.
0 commit comments