Fix notarization

DRSchlaubi · May 26, 2023 · 519754d · 519754d
1 parent 339afb3
commit 519754d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,12 +71,7 @@ jobs:
           # import certificate to keychain
           security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
           security import INSTALLER_CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
-          security list-keychain -d user -s $KEYCHAIN_PATH
-          
-          # Store Password for notarization
-          xcrun altool --store-password-in-keychain-item "NOTARIZATION_PASSWORD" \
-                       --username michael@rittmeister.in \
-                       --password $PASSWORD          
+          security list-keychain -d user -s $KEYCHAIN_PATH   
 
       - name: Build App Distribution
         uses: gradle/gradle-build-action@v2
@@ -109,7 +104,7 @@ jobs:
           path: |
             app/desktop/build/compose/binaries/main-release/deb/*.deb
             app/desktop/build/compose/binaries/main-release/msi/*.msi
-            app/desktop/build/compose/binaries/main-release/pkg/pkg.dmg
+            app/desktop/build/compose/binaries/main-release/pkg/*.pkg
   build_android_app:
     runs-on: ubuntu-latest
     name: Build Android App

diff --git a/app/desktop/build.gradle.kts b/app/desktop/build.gradle.kts
@@ -52,7 +52,7 @@ compose.desktop {
                 }
                 notarization {
                     appleID.set("michael@rittmeister.in")
-                    password.set("@keychain:NOTARIZATION_PASSWORD")
+                    password.set(System.getenv("NOTARIZATION_PASSWORD"))
                 }
             }
         }

diff --git a/gradle.properties b/gradle.properties
@@ -9,3 +9,4 @@ org.jetbrains.compose.experimental.uikit.enabled=true
 kotlin.native.ignoreIncorrectDependencies=true
 kotlin.native.cacheKind=none
 kotlin.native.ignoreDisabledTargets=true
+compose.desktop.verbose=true