feat: Update package version to "8.4.606" and enhance macOS build scripts

Author: softartdev

.github/scripts/import_macos_dev_id_cert.sh

@@ -11,23 +11,29 @@ if [ ! -f "$KEYCHAIN_PATH" ]; then
   security create-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_NAME"
 fi
 
+# Make sure keychain doesn't auto-lock during the build
+# -l  : lock after timeout
+# -u  : lock when user logs out
+# -t  : timeout in seconds (here: 6 hours)
+security set-keychain-settings -lut 21600 "$KEYCHAIN_PATH"
+
 # Add keychain to the search list and make it default for this session
-security list-keychains -s "$KEYCHAIN_PATH"
+security list-keychains -s "$KEYCHAIN_PATH" $(security list-keychains | sed 's/[\",]//g')
 security default-keychain -s "$KEYCHAIN_PATH"
 security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
 
-# Import Developer ID certificate and allow all apps to access the private key
+# Import Developer ID certificate
 security import "$P12_PATH" \
   -k "$KEYCHAIN_PATH" \
   -P "$LARGE_SECRET_PASSPHRASE" \
+  -A \
   -T /usr/bin/codesign \
   -T /usr/bin/productbuild \
-  -T /usr/bin/security \
-  -A
+  -T /usr/bin/security
 
-# Allow non-interactive access for codesign/productbuild/notarytool on CI
+# Allow non-interactive access for codesign / productbuild / notarytool
 security set-key-partition-list \
   -S apple-tool:,apple: \
   -s \
   -k "$KEYCHAIN_PASSWORD" \
-  "$KEYCHAIN_PATH"
+  "$KEYCHAIN_PATH"

.github/workflows/desktop.yaml

@@ -9,6 +9,7 @@ jobs:
   build_job:
     name: Package
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 25
     strategy:
       fail-fast: false
       matrix:
@@ -35,7 +36,7 @@ jobs:
         run: ./.github/scripts/import_macos_dev_id_cert.sh
         env:
           LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
-      - name: Debug code signing identities
+      - name: Debug code signing identities (macOS)
         if: matrix.os == 'macos-latest'
         run: |
           security list-keychains
@@ -44,7 +45,13 @@ jobs:
         run: ./gradlew :app:desktop:packageReleaseUberJarForCurrentOS
       - name: Packaging (macOS)
         if: matrix.os == 'macos-latest'
+        continue-on-error: true
         run: ./gradlew --no-configuration-cache :app:desktop:notarizeReleaseDmg
+      - name: Debug hanging processes (macOS)
+        if: always() && matrix.os == 'macos-latest'
+        run: |
+          echo "=== ps aux | egrep 'java|jpackage|codesign|notarytool' ==="
+          ps aux | egrep 'java|jpackage|codesign|notarytool' || true
       - name: Packaging (Linux & Windows)
         if: matrix.os != 'macos-latest'
         run: ./gradlew packageReleaseDistributionForCurrentOS
@@ -55,4 +62,4 @@ jobs:
             app/desktop/build/compose/binaries/main-release/deb/*.deb
             app/desktop/build/compose/binaries/main-release/dmg/*.dmg
             app/desktop/build/compose/binaries/main-release/msi/*.msi
-            app/desktop/build/compose/jars/*.jar
+            app/desktop/build/compose/jars/*.jar

app/desktop/build.gradle.kts

@@ -50,7 +50,7 @@ compose.desktop {
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
             packageName = "Note Delight"
-            packageVersion = "8.4.605"
+            packageVersion = "8.4.606"
             description = "Note app with encryption"
             copyright = "© 2023 SoftArtDev"
             macOS.iconFile.set(project.file("src/jvmMain/resources/app_icon.icns"))