From e6855ad2f97266a329b23aa08e77140d637be181 Mon Sep 17 00:00:00 2001
From: Jelle Spijker <j.spijker@ultimaker.com>
Date: Fri, 1 Jul 2022 14:57:37 +0200
Subject: [PATCH] use different pass

Contributes to CURA-9365
---
 .github/workflows/cura-installer.yml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml
index b9caca6b17..63a63d097c 100644
--- a/.github/workflows/cura-installer.yml
+++ b/.github/workflows/cura-installer.yml
@@ -121,7 +121,7 @@ jobs:
                 run: |
                     CERTIFICATE_PATH=$RUNNER_TEMP/um_keychain.p12
                     echo -n "$MACOS_CERT_P12" | base64 --decode --output $CERTIFICATE_PATH
-                    security import $CERTIFICATE_PATH -P $MACOS_CERT_PASS -A
+                    security import $CERTIFICATE_PATH -P $MACOS_CERT_USER -A
                     security unlock -p $MACOS_CERT_USER $CERTIFICATE_PATH
 
             -   name: Clean Conan local cache
@@ -176,6 +176,28 @@ jobs:
                 run: python ../cura_inst/packaging/AppImage/create_appimage.py ./Ultimaker-Cura $CURA_VERSION_FULL
                 working-directory: dist
 
+            -   name: Create the MacOS dmg (Bash) alternative
+                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }}
+                run: |
+                    create-dmg \
+                        --window-pos 640 360 \
+                        --volicon "../cura_inst/packaging/icons/VolumeIcons_Cura.icns" \
+                        --window-size 690 503 \
+                        --icon-size 90 \
+                        --icon "Ultimaker Cura.app" 169 272 \
+                        --app-drop-link 520 272 \
+                        --eula "../cura_inst/packaging/cura_license.txt" \
+                        --background "../cura_inst/packaging/icons/cura_background_dmg.png" \
+                        --rez Rez \
+                        "./Ultimaker-Cura.dmg" \
+                        "./Ultimaker-Cura.app"
+                      sync
+                working-directory: dist
+
+            -   name: Sign the MacOS dmg (Bash) alternative
+                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }}
+                run: |
+
             -   name: Create the MacOS dmg (Bash)
                 if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }}
                 run: python ../cura_inst/packaging/dmg/dmg_sign_notarize.py