From bdbcb976154ed0cf73ddcfd0e4aea5996829823b Mon Sep 17 00:00:00 2001 From: Jan Keith Darunday Date: Mon, 8 Jun 2026 22:03:31 +0800 Subject: [PATCH] Allow empty notarization method --- make-pear-app/action.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/make-pear-app/action.yml b/make-pear-app/action.yml index 23f6fb2..aa23aa0 100644 --- a/make-pear-app/action.yml +++ b/make-pear-app/action.yml @@ -87,10 +87,12 @@ runs: [ -z "${{ inputs.macos_certificate_base64 }}" ] && MISSING="$MISSING macos_certificate_base64" [ -z "${{ inputs.macos_p12_password }}" ] && MISSING="$MISSING macos_p12_password" [ -z "${{ inputs.macos_codesign_identity }}" ] && MISSING="$MISSING macos_codesign_identity" - [ -z "${{ inputs.macos_notarization_method }}" ] && MISSING="$MISSING macos_notarization_method" # Validate notarization fields based on selected method case "${{ inputs.macos_notarization_method }}" in + "") + # Allow empty notarization method + ;; appstore_connect) [ -z "${{ inputs.macos_api_key_base64 }}" ] && MISSING="$MISSING macos_api_key_base64" [ -z "${{ inputs.macos_api_key_id }}" ] && MISSING="$MISSING macos_api_key_id" @@ -106,7 +108,7 @@ runs: esac if [ "$INVALID_METHOD" = "true" ]; then - echo "Error: Invalid macos_notarization_method '${{ inputs.macos_notarization_method }}'. Must be 'appstore_connect' or 'apple_id_password'." + echo "Error: Invalid macos_notarization_method '${{ inputs.macos_notarization_method }}'. Must be '', 'appstore_connect' or 'apple_id_password'." fi # Fail if any required fields are missing or invalid @@ -210,7 +212,7 @@ runs: --key-id "${{ inputs.macos_api_key_id }}" \ --issuer "${{ inputs.macos_api_issuer }}" \ --keychain "$KEYCHAIN_PATH" - else + elif [ "${{ inputs.macos_notarization_method }}" = "apple_id_password" ]; then xcrun notarytool store-credentials "$KEYCHAIN_PROFILE" \ --apple-id "${{ inputs.macos_apple_id }}" \ --password "${{ inputs.macos_apple_password }}" \