add notarization team

This commit is contained in:
Alessandro Muntoni 2023-06-08 11:22:58 +02:00
parent e46cf95350
commit 5bd08a343c
3 changed files with 13 additions and 3 deletions

View File

@ -90,7 +90,7 @@ jobs:
- name: Deploy
shell: bash
run: |
bash scripts/${{ runner.os }}/2_deploy.sh --cert_pssw='${{ secrets.WIN_CERTIFICATE_PSSW }}' --cert_id='${{ secrets.MACOS_CERT_ID }}' --notarization_user='${{ secrets.MACOS_NOTARIZATION_USER }}' --notarization_pssw='${{ secrets.MACOS_NOTARIZATION_PSSW }}'
bash scripts/${{ runner.os }}/2_deploy.sh --cert_pssw='${{ secrets.WIN_CERTIFICATE_PSSW }}' --cert_id='${{ secrets.MACOS_CERT_ID }}' --notarization_user='${{ secrets.MACOS_NOTARIZATION_USER }}' --notarization_team='${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}' --notarization_pssw='${{ secrets.MACOS_NOTARIZATION_PSSW }}'
- name: Upload MeshLab Portable
uses: actions/upload-artifact@v3
with:

View File

@ -9,6 +9,7 @@ SIGN=false
NOTARIZE=false
CERT_ID=""
NOTAR_USER=""
NOTAR_TEAM_ID=""
NOTAR_PASSWORD=""
#checking for parameters
@ -45,6 +46,10 @@ case $i in
NOTAR_PASSWORD="${i#*=}"
shift # past argument=value
;;
-nt=*|--notarization_team=*)
NOTAR_TEAM_ID="${i#*=}"
shift # past argument=value
;;
*)
# unknown option
;;
@ -62,7 +67,7 @@ if [ "$SIGN" = true ] ; then
fi
if [ "$NOTARIZE" = true ] ; then
bash $SCRIPTS_PATH/internal/2c_notarize_appbundle.sh -i=$INSTALL_PATH -nu=$NOTAR_USER -np=$NOTAR_PASSWORD
bash $SCRIPTS_PATH/internal/2c_notarize_appbundle.sh -i=$INSTALL_PATH -nu=$NOTAR_USER -nt=$NOTAR_TEAM_ID -np=$NOTAR_PASSWORD
echo "======= AppBundle Notarized ======="
fi

View File

@ -5,6 +5,7 @@ SCRIPTS_PATH="$(dirname "$(realpath "$0")")"/..
INSTALL_PATH=$SCRIPTS_PATH/../../install
NOTAR_USER=""
NOTAR_PASSWORD=""
NOTAR_TEAM_ID=""
#checking for parameters
for i in "$@"
@ -18,6 +19,10 @@ case $i in
NOTAR_USER="${i#*=}"
shift # past argument=value
;;
-nt=*|--notarization_team=*)
NOTAR_TEAM_ID="${i#*=}"
shift # past argument=value
;;
-np=*|--notarization_pssw=*)
NOTAR_PASSWORD="${i#*=}"
shift # past argument=value
@ -28,7 +33,7 @@ case $i in
esac
done
xcrun notarytool store-credentials "notarytool-profile" --apple-id "$NOTAR_USER" --password "$NOTAR_PASSWORD"
xcrun notarytool store-credentials "notarytool-profile" --apple-id $NOTAR_USER --team-id $NOTAR_TEAM_ID --password $NOTAR_PASSWORD
ditto -c -k --keepParent "$INSTALL_PATH/meshlab.app" "$INSTALL_PATH/notarization.zip"