diff --git a/.github/actions/setup-macos-codesigning/action.yaml b/.github/actions/setup-macos-codesigning/action.yaml index c7bfcb0..9178472 100644 --- a/.github/actions/setup-macos-codesigning/action.yaml +++ b/.github/actions/setup-macos-codesigning/action.yaml @@ -70,7 +70,7 @@ runs: : macOS Code Signing ✍️ if (( ${+RUNNER_DEBUG} )) setopt XTRACE - if [[ ${MACOS_SIGNING_IDENTITY} && ${MACOS_SIGNING_IDENTITY_INSTALLER} && ${MACOS_SIGNING_CERT} ]] { + if [[ ${MACOS_SIGNING_IDENTITY} && ${MACOS_SIGNING_CERT} ]] { print 'haveCodesignIdent=true' >> $GITHUB_OUTPUT local -r certificate_path="${RUNNER_TEMP}/build_certificate.p12" diff --git a/.github/scripts/package-macos b/.github/scripts/package-macos index 8d1b29d..827ad57 100755 --- a/.github/scripts/package-macos +++ b/.github/scripts/package-macos @@ -43,7 +43,7 @@ package() { local buildspec_file=${project_root}/buildspec.json fpath=("${SCRIPT_HOME}/utils.zsh" ${fpath}) - autoload -Uz log_group log_error log_output check_macos + autoload -Uz log_group log_error log_warning log_output check_macos if [[ ! -r ${buildspec_file} ]] { log_error \ @@ -117,7 +117,7 @@ package() { typeset -gx CODESIGN_IDENT_INSTALLER="${CODESIGN_IDENT_INSTALLER:--}" typeset -gx CODESIGN_TEAM="$(print "${CODESIGN_IDENT}" | /usr/bin/sed -En 's/.+\((.+)\)/\1/p')" - if (( codesign )) { + if (( codesign )) && [[ ${CODESIGN_IDENT_INSTALLER} != - ]] { productsign \ --sign "${CODESIGN_IDENT_INSTALLER}" \ ${project_root}/release/${config}/${product_name}.pkg \ @@ -125,11 +125,14 @@ package() { rm ${project_root}/release/${config}/${product_name}.pkg } else { + if (( codesign )) log_warning "No Developer ID Installer identity: the plugin is signed, the package is not." mv ${project_root}/release/${config}/${product_name}.pkg \ ${project_root}/release/${output_name}.pkg } - if (( codesign && notarize )) { + if (( codesign && notarize )) && [[ ${CODESIGN_IDENT_INSTALLER} == - ]] { + log_warning "Skipping notarization: an unsigned package cannot be notarized." + } elif (( codesign && notarize )) { if ! [[ ${CODESIGN_IDENT} != '-' && ${CODESIGN_TEAM} && {CODESIGN_IDENT_USER} && ${CODESIGN_IDENT_PASS} ]] { log_error "Notarization requires Apple ID and application password." return 2