diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 737c867461..2963f733fe 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -48,7 +48,6 @@ env: MACOS_CERT_USER: ${{ secrets.MACOS_CERT_USER }} GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} MACOS_CERT_PASSPHRASE: ${{ secrets.MACOS_CERT_PASSPHRASE }} - MACOS_CERT_ID: ${{ secrets.MACOS_CERT_ID }} jobs: cura-installer-create: @@ -124,7 +123,7 @@ jobs: CERTIFICATE_PATH=$RUNNER_TEMP/um_keychain.p12 echo -n "$MACOS_CERT_P12" | base64 --decode --output $CERTIFICATE_PATH security import $CERTIFICATE_PATH -P $MACOS_CERT_PASSPHRASE -A - security unlock -p $MACOS_CERT_PASSPHRASE $MACOS_CERT_ID +# security unlock -p $MACOS_CERT_PASSPHRASE $CERTIFICATE_PATH - name: Clean Conan local cache if: ${{ inputs.conan_clean_local_cache }} @@ -193,13 +192,13 @@ jobs: run: xcrun altool --notarize-app --primary-bundle-id "nl.ultimaker.cura" --username "$MAC_NOTARIZE_USER" --password "$MAC_NOTARIZE_PASS" --file "./Ultimaker-Cura.dmg" working-directory: dist -# - 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 -# working-directory: dist -# env: -# SOURCE_DIR: ${{ env.GITHUB_WORKSPACE }}/cura_inst -# DIST_DIR: ${{ env.GITHUB_WORKSPACE }}/dist + - 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 + working-directory: dist + env: + SOURCE_DIR: ${{ env.GITHUB_WORKSPACE }}/cura_inst + DIST_DIR: ${{ env.GITHUB_WORKSPACE }}/dist - name: Upload the artifacts uses: actions/upload-artifact@v3