Browse Source

Falling back to original Notarizing script

Alternative steps were there for debugging purposes

Contributes to CURA-9365
j.spijker@ultimaker.com 2 years ago
parent
commit
4fb7d0e691
1 changed files with 5 additions and 20 deletions
  1. 5 20
      .github/workflows/cura-installer.yml

+ 5 - 20
.github/workflows/cura-installer.yml

@@ -190,28 +190,13 @@ 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
+            -   name: Create the MacOS dmg (Bash)
                 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" "./Ultimaker-Cura.dmg" "./Ultimaker-Cura.app"
+                run: python ../cura_inst/packaging/dmg/dmg_sign_notarize.py
                 working-directory: dist
-
-            -   name: Sign the MacOS dmg (Bash) alternative
-                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }}
-                run: codesign -s "$CODESIGN_IDENTITY" --timestamp -i "nl.ultimaker.cura" "./Ultimaker-Cura.dmg"
-                working-directory: dist
-
-            -   name: Notarize the MacOS dmg (Bash) alternative
-                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }}
-                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
+                env:
+                    SOURCE_DIR: ${{ env.GITHUB_WORKSPACE }}/cura_inst
+                    DIST_DIR: ${{ env.GITHUB_WORKSPACE }}/dist
 
             -   name: Upload the artifacts
                 uses: actions/upload-artifact@v3