From 51b03099d80c1a879bc33acc6421cc14ea64132c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Fri, 11 Jul 2025 19:50:09 +0200
Subject: [PATCH] A better (and hopefully working...) keychain handling

---
 .github/workflows/osx.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index 20ea5850..d8c1f7f1 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -39,17 +39,16 @@ jobs:
           run-id: ${{ steps.runid.outputs.runid }}
       - name: Install codesigning certificate
         env:
-          CODESIGN_MAC: ${{ secrets.CODESIGN_MAC }}
+          MACOS_CERTIFICATE: ${{ secrets.CODESIGN_MAC }}
+          KEYCHAIN_NAME: gpxsee
+          KEYCHAIN_PWD: password
         run: |
-          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-          echo -n "$CODESIGN_MAC" | base64 --decode -o $CERTIFICATE_PATH
-          security create-keychain -p password $KEYCHAIN_PATH
-          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
-          security unlock-keychain -p password $KEYCHAIN_PATH
-          security import $CERTIFICATE_PATH -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
-          security set-key-partition-list -S apple-tool:,apple: -k password $KEYCHAIN_PATH
-          security list-keychain -d user -s $KEYCHAIN_PATH
+          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+          security create-keychain -p $KEYCHAIN_PWD $KEYCHAIN_NAME
+          security default-keychain -s $KEYCHAIN_NAME
+          security unlock-keychain -p $KEYCHAIN_PWD $KEYCHAIN_NAME
+          security import certificate.p12 -k $KEYCHAIN_NAME -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PWD $KEYCHAIN_NAME
       - name: Create DMG
         run: macdeployqt GPXSee.app -dmg -appstore-compliant -codesign=GPXSee
       - name: Upload artifacts