Reset DMG packaging to appdmg

Author: kdelmotte

.github/dmgbuild-settings.py

@@ -111,39 +111,21 @@ jobs:
           echo "Stapling failed after 3 attempts"
           exit 1
 
-      - name: Install DMG packaging dependencies
+      - name: Verify Node toolchain
         run: |
-          DMG_VENV="$RUNNER_TEMP/dmgbuild-venv"
-          python3 -m venv "$DMG_VENV"
-          "$DMG_VENV/bin/python" -m pip install --quiet --upgrade pip
-          "$DMG_VENV/bin/python" -m pip install --quiet pillow ds_store mac-alias
-          echo "DMG_PYTHON=$DMG_VENV/bin/python" >> "$GITHUB_ENV"
+          node --version
+          npx --version
 
       - name: Package DMG for release
         run: |
           APP_PATH="$RUNNER_TEMP/DerivedDataRelease/Build/Products/Release/TypoFixr.app"
           RELEASE_DMG="$RUNNER_TEMP/TypoFixr.dmg"
-          DMG_BACKGROUND_PATH="$RUNNER_TEMP/dmg-background.png"
-          DMG_PYTHON="$DMG_PYTHON"
-          DMG_STAGING_DIR="$RUNNER_TEMP/dmg-staging"
           DMG_TITLE="Install TypoFixr"
 
-          for volume in /Volumes/Install\\ TypoFixr* /Volumes/TypoFixr*; do
-            [ -e "$volume" ] || continue
-            hdiutil detach "$volume" -force -quiet || true
-          done
-
-          DMG_BACKGROUND_PATH="$DMG_BACKGROUND_PATH" "$DMG_PYTHON" scripts/generate_dmg_background.py
-
-          rm -rf "$DMG_STAGING_DIR"
-          mkdir -p "$DMG_STAGING_DIR"
-          ditto "$APP_PATH" "$DMG_STAGING_DIR/TypoFixr.app"
-
-          "$DMG_PYTHON" scripts/build_dmg.py \
-            --app-path "$DMG_STAGING_DIR/TypoFixr.app" \
-            --background-path "$DMG_BACKGROUND_PATH" \
-            --dmg-title "$DMG_TITLE" \
-            --output-path "$RELEASE_DMG"
+          APP_PATH="$APP_PATH" \
+          OUTPUT_DMG_PATH="$RELEASE_DMG" \
+          DMG_TITLE="$DMG_TITLE" \
+          ./scripts/package_dmg.sh
 
           codesign --force --timestamp --sign "Developer ID Application" "$RELEASE_DMG"
           codesign --verify --verbose "$RELEASE_DMG"

.github/workflows/release.yml

@@ -237,6 +237,10 @@ Contributions are welcome! Please open an issue or pull request.
 
 ## Changelog
 
+### v1.3.6
+- Replaced the custom DMG packaging path with a standard `appdmg` drag-and-drop installer flow
+- Switched to static DMG background assets so the release and local preflight use the same fixed installer layout
+
 ### v1.3.5
 - Rebuilt the DMG authoring path so Finder gets both background records instead of dropping the installer art
 - Restored the installer background/arrow path without relying on flaky Finder automation

README.md

@@ -17,7 +17,7 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.3.5</string>
+    <string>1.3.6</string>
     <key>CFBundleVersion</key>
     <string>1</string>
     <key>LSMinimumSystemVersion</key>

Sources/TypoFixr/Info.plist

@@ -465,7 +465,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 1.3.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.typofixr.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -481,7 +481,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 1.3.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.typofixr.app.tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
@@ -568,7 +568,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 1.3.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.typofixr.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -584,7 +584,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 1.3.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.typofixr.app.tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;