From 526b61237e9c155ab53750168a0cbcb2855235d4 Mon Sep 17 00:00:00 2001 From: Connor Yoh Date: Fri, 11 Jul 2025 14:03:39 +0100 Subject: [PATCH] timeout doesn't exist --- .github/workflows/tauri-test.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tauri-test.yml b/.github/workflows/tauri-test.yml index 61b613de7..3d0b2a5ea 100644 --- a/.github/workflows/tauri-test.yml +++ b/.github/workflows/tauri-test.yml @@ -242,33 +242,39 @@ jobs: security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain security set-keychain-settings -t 3600 -u build.keychain - # Add timeout and proper error handling - timeout 300 jarsigner -verbose \ + # Try jarsigner with proper error handling + echo "Attempting jarsigner with KeychainStore..." + if jarsigner -verbose \ -keystore "$KEYCHAIN_PATH" \ -storetype KeychainStore \ -storepass "$KEYCHAIN_PASSWORD" \ -signedjar "${MAIN_JAR}.signed" \ "$MAIN_JAR" \ - "$CERT_ID" || { - echo "❌ jarsigner failed or timed out" + "$CERT_ID"; then + echo "✅ KeychainStore signing successful" + else + echo "❌ KeychainStore signing failed" echo "Trying alternative approach with PKCS12 keystore..." # Convert to PKCS12 and try again security export -k build.keychain -t identities -f pkcs12 -o temp_cert.p12 -P "$APPLE_CERTIFICATE_PASSWORD" - timeout 300 jarsigner -verbose \ + if jarsigner -verbose \ -keystore temp_cert.p12 \ -storetype PKCS12 \ -storepass "$APPLE_CERTIFICATE_PASSWORD" \ -signedjar "${MAIN_JAR}.signed" \ "$MAIN_JAR" \ - 1 || { + 1; then + echo "✅ PKCS12 signing successful" + else echo "❌ Both signing methods failed" + rm -f temp_cert.p12 exit 1 - } + fi rm -f temp_cert.p12 - } + fi # Replace original with signed JAR mv "${MAIN_JAR}.signed" "$MAIN_JAR"