Author SHA1 Message Date
gronod 6976ced610 feat(ci): build styled macOS DMG headlessly via dmgbuild (#189)
Build Windows Packages / Build Windows (push) Canceled after 10s
Build Linux Packages / Build Linux (push) Canceled after 14s
Build macOS Packages / Build macOS (Intel) (push) Successful in 10m34s
Build macOS Packages / Build macOS (Apple Silicon) (push) Successful in 10m43s
- Add scripts/build-dmg.py using dmgbuild to generate DMGs with custom background art and icon locations without Finder AppleScript.
- Update .gitea/workflows/build-macos.yml and .github/workflows/build-macos.yml to package the .app bundle using dmgbuild in a headless virtual environment.
- Resolves missing DMG background in CI while preventing AppleScript GUI automation timeouts.
2026-09-06 22:04:36 +01:00
gronod f47e65ee1f Merge pull request 'Main' (#221) from main into development
Reviewed-on: #221
2026-09-06 21:11:22 +01:00
gronod 193e492c10 Update .gitea/workflows/build-macos.yml
Build Windows Packages / Build Windows (push) Successful in 7m35s
Build macOS Packages / Build macOS (Apple Silicon) (push) Successful in 9m25s
Build Linux Packages / Build Linux (push) Successful in 10m52s
Build macOS Packages / Build macOS (Intel) (push) Successful in 7m14s
Re-enabled arm64
2026-09-06 20:16:52 +01:00
gronod 899718d896 Merge pull request 'Merge development into main' (#220) from development into main
Build Windows Packages / Build Windows (push) Successful in 7m44s
Build macOS Packages / Build macOS (Intel) (push) Successful in 8m18s
Build Linux Packages / Build Linux (push) Successful in 10m18s
2026-09-06 19:26:32 +01:00
gronod 7a9637b5d0 Merge pull request 'ci(macos): allow headless DMG bundling on Gitea runners' (#219) from ci/fix-macos-dmg-bundling into development 2026-09-06 19:26:24 +01:00
gronod 1af844c7e2 ci(macos): allow headless DMG bundling on Gitea runners 2026-09-06 19:24:30 +01:00
gronod 56f275a023 Merge branch 'ci/215-frontend-tests' into development (#215) 2026-09-06 16:40:43 +01:00
gronod 54792a8690 Merge branch 'fix/213-atomic-history-writes' into development (#213) 2026-09-06 16:40:41 +01:00
gronod 906b4f9104 ci: add npm test script and integrate frontend tests into CI workflows (#215) 2026-09-06 16:40:37 +01:00
gronod 9102c95468 ci(macos): remove redundant cargo test step from release workflow
Build Windows Packages / Build Windows (push) Successful in 7m13s
Build Linux Packages / Build Linux (push) Successful in 10m27s
Build macOS Packages / Build macOS (Intel) (push) Failing after 10m35s
Merge pull request 'ci(macos): remove redundant cargo test step from release workflow' (#218) from development into main
2026-09-06 16:23:09 +01:00
gronod 11e796fd17 Development
Build Windows Packages / Build Windows (push) Successful in 7m39s
Build Linux Packages / Build Linux (push) Successful in 9m54s
Build macOS Packages / Build macOS (Intel) (push) Failing after 14m45s
Merge pull request 'Development' (#217) from development into main
2026-09-06 16:08:49 +01:00
gronod a8c4025c01 Merge pull request 'Development' (#216) from development into main
Build Windows Packages / Build Windows (push) Successful in 7m38s
Build Linux Packages / Build Linux (push) Successful in 8m59s
Build macOS Packages / Build macOS (Apple Silicon) (push) Failing after 1m13s
Build macOS Packages / Build macOS (Universal (Intel + Apple Silicon)) (push) Failing after 1m28s
Build macOS Packages / Build macOS (Intel) (push) Failing after 51s
Reviewed-on: #216
2026-09-06 13:56:17 +01:00
6 changed files with 194 additions and 43 deletions
+3
View File
@@ -64,6 +64,9 @@ jobs:
- name: Install Node dependencies
run: npm ci
- name: Run frontend tests
run: npm test
- name: Set Release Environment
id: set_env
shell: bash
+24 -24
View File
@@ -19,11 +19,11 @@ jobs:
target: x86_64-apple-darwin
binary_dir: macos-x86_64
arch: x86_64
# - name: Apple Silicon
# os: macos
# target: aarch64-apple-darwin
# binary_dir: macos-aarch64
# arch: arm64
- name: Apple Silicon
os: macos
target: aarch64-apple-darwin
binary_dir: macos-aarch64
arch: arm64
# - name: Universal (Intel + Apple Silicon)
# os: macos
# target: universal-apple-darwin
@@ -59,6 +59,9 @@ jobs:
- name: Install Node dependencies
run: npm ci
- name: Run frontend tests
run: npm test
- name: Fetch ArgyllCMS binaries
env:
ARGYLL_SERVER_URL: ${{ github.server_url }}
@@ -81,23 +84,9 @@ jobs:
echo "SHORT_SHA=${SHORT_SHA}" >> $GITHUB_ENV
echo "PREFIX=ICCery_${TAG}-${SHORT_SHA}-macos-${{ matrix.platform.arch }}" >> $GITHUB_ENV
- name: Warm up macOS GUI for DMG layout
shell: bash
run: |
# Tauri's DMG bundler runs Finder AppleScript to set the background
# picture and icon positions. On CI Macs, Finder/Aqua may be idle,
# which causes AppleEvent timeouts (-1712). Wake them before build.
echo "WindowServer: $(pgrep -l WindowServer || echo 'NOT RUNNING')"
echo "console user: $(stat -f '%Su' /dev/console 2>/dev/null || echo unknown)"
echo "whoami: $(whoami)"
open -g -a Finder || true
open -g -a "System Events" || true
osascript -e 'tell application "Finder" to get name' || true
sleep 10
- name: Build Tauri App
env:
TAURI_BUNDLER_DMG_IGNORE_CI: "true"
CI: "true"
run: npm run tauri build -- --target ${{ matrix.platform.target }}
- name: Prepare Release Assets
@@ -105,11 +94,22 @@ jobs:
run: |
mkdir -p release-assets
# Stage DMG package
DMG_FILE=$(find src-tauri/target -type f -path "*/release/bundle/dmg/*.dmg" | head -n 1)
if [ -n "$DMG_FILE" ] && [ -f "$DMG_FILE" ]; then
cp "$DMG_FILE" "release-assets/${PREFIX}.dmg"
APP_PATH=$(find src-tauri/target -type d -path "*/release/bundle/macos/*.app" | head -n 1)
if [ -z "$APP_PATH" ] || [ ! -d "$APP_PATH" ]; then
echo "Error: Could not locate built .app bundle in src-tauri/target"
exit 1
fi
echo "Found .app bundle: ${APP_PATH}"
# Setup isolated Python virtual environment for dmgbuild
python3 -m venv "${{ runner.temp }}/dmgbuild-venv"
"${{ runner.temp }}/dmgbuild-venv/bin/pip" install --quiet dmgbuild
# Build styled DMG with background art and custom icon locations
"${{ runner.temp }}/dmgbuild-venv/bin/python" scripts/build-dmg.py \
--app "${APP_PATH}" \
--output "release-assets/${PREFIX}.dmg" \
--volname "ICCery"
- name: Upload Artifacts
+3
View File
@@ -41,6 +41,9 @@ jobs:
- name: Install Node dependencies
run: npm ci
- name: Run frontend tests
run: npm test
- name: Fetch ArgyllCMS binaries
shell: powershell
env:
+16 -18
View File
@@ -84,22 +84,9 @@ jobs:
echo "SHORT_SHA=${SHORT_SHA}" >> $GITHUB_ENV
echo "PREFIX=ICCery_${TAG}-${SHORT_SHA}-macos-${{ matrix.platform.arch }}" >> $GITHUB_ENV
- name: Warm up macOS GUI for DMG layout
if: runner.os == 'macOS'
run: |
# Tauri's DMG bundler runs an AppleScript that asks Finder to set the
# background picture and icon positions. On CI runners, Finder or the
# Aqua session may be idle, which can cause AppleEvent timeouts. Try to
# start/awaken Finder and System Events before the real build.
open -g -a Finder || true
open -g -a "System Events" || true
# Send a harmless probe to force Finder to initialise a scripting session.
osascript -e 'tell application "Finder" to get name' || true
sleep 10
- name: Build Tauri App
env:
TAURI_BUNDLER_DMG_IGNORE_CI: "true"
CI: "true"
run: npm run tauri build -- --target ${{ matrix.platform.target }}
- name: Prepare Release Assets
@@ -107,11 +94,22 @@ jobs:
run: |
mkdir -p release-assets
# Stage DMG package
DMG_FILE=$(find src-tauri/target -type f -path "*/release/bundle/dmg/*.dmg" | head -n 1)
if [ -n "$DMG_FILE" ] && [ -f "$DMG_FILE" ]; then
cp "$DMG_FILE" "release-assets/${PREFIX}.dmg"
APP_PATH=$(find src-tauri/target -type d -path "*/release/bundle/macos/*.app" | head -n 1)
if [ -z "$APP_PATH" ] || [ ! -d "$APP_PATH" ]; then
echo "Error: Could not locate built .app bundle in src-tauri/target"
exit 1
fi
echo "Found .app bundle: ${APP_PATH}"
# Setup isolated Python virtual environment for dmgbuild
python3 -m venv "${{ runner.temp }}/dmgbuild-venv"
"${{ runner.temp }}/dmgbuild-venv/bin/pip" install --quiet dmgbuild
# Build styled DMG with background art and custom icon locations
"${{ runner.temp }}/dmgbuild-venv/bin/python" scripts/build-dmg.py \
--app "${APP_PATH}" \
--output "release-assets/${PREFIX}.dmg" \
--volname "ICCery"
- name: Upload Artifacts
+2 -1
View File
@@ -5,7 +5,8 @@
"type": "module",
"scripts": {
"fetch-argyll": "node scripts/fetch-argyll.mjs",
"tauri": "tauri"
"tauri": "tauri",
"test": "node src/js/profcheck.test.js && node src/js/chartread.test.js && node src/js/gamut_viewer.test.js"
},
"devDependencies": {
"@tauri-apps/cli": "^2"
+146
View File
@@ -0,0 +1,146 @@
#!/usr/bin/env python3
"""
Headless macOS DMG Builder for ICCery.
Uses `dmgbuild` to package the .app bundle into a styled DMG with custom
background art, window bounds, and icon locations without requiring Finder
AppleScript automation or an interactive display session.
"""
import argparse
import os
import sys
def parse_args():
parser = argparse.ArgumentParser(description="Build styled macOS DMG installer")
parser.add_argument(
"--app",
required=True,
help="Path to the .app application bundle",
)
parser.add_argument(
"--output",
required=True,
help="Path to the output .dmg file",
)
parser.add_argument(
"--volname",
default="ICCery",
help="Volume name for the mounted disk image (default: ICCery)",
)
parser.add_argument(
"--background",
default="src-tauri/icons/dmg-background.png",
help="Path to background image (default: src-tauri/icons/dmg-background.png)",
)
parser.add_argument(
"--icon",
default="src-tauri/icons/icon.icns",
help="Path to volume icon .icns (default: src-tauri/icons/icon.icns)",
)
parser.add_argument(
"--window-size",
nargs=2,
type=int,
default=[660, 400],
metavar=("WIDTH", "HEIGHT"),
help="Window width and height in points (default: 660 400)",
)
parser.add_argument(
"--icon-size",
type=int,
default=100,
help="Icon size in points (default: 100)",
)
parser.add_argument(
"--app-pos",
nargs=2,
type=int,
default=[180, 220],
metavar=("X", "Y"),
help="App icon location (default: 180 220)",
)
parser.add_argument(
"--apps-link-pos",
nargs=2,
type=int,
default=[480, 220],
metavar=("X", "Y"),
help="Applications symlink location (default: 480 220)",
)
return parser.parse_args()
def main():
args = parse_args()
app_path = os.path.abspath(args.app)
output_path = os.path.abspath(args.output)
bg_path = os.path.abspath(args.background) if args.background else None
icon_path = os.path.abspath(args.icon) if args.icon else None
if not os.path.isdir(app_path):
print(f"Error: Application bundle does not exist at '{app_path}'", file=sys.stderr)
sys.exit(1)
if bg_path and not os.path.isfile(bg_path):
print(f"Error: Background image not found at '{bg_path}'", file=sys.stderr)
sys.exit(1)
try:
import dmgbuild
except ImportError:
print("Error: 'dmgbuild' is required. Install via: pip install dmgbuild", file=sys.stderr)
sys.exit(1)
app_name = os.path.basename(app_path)
output_dir = os.path.dirname(output_path)
if output_dir:
os.makedirs(output_dir, exist_ok=True)
if os.path.exists(output_path):
os.remove(output_path)
win_w, win_h = args.window_size
app_x, app_y = args.app_pos
apps_x, apps_y = args.apps_link_pos
settings = {
"files": [app_path],
"symlinks": {"Applications": "/Applications"},
"background": bg_path,
"icon": icon_path if icon_path and os.path.isfile(icon_path) else None,
"icon_size": args.icon_size,
"window_rect": ((100, 100), (win_w, win_h)),
"icon_locations": {
app_name: (app_x, app_y),
"Applications": (apps_x, apps_y),
},
"format": "UDZO",
}
print(f"Building DMG for {app_name}...")
print(f" Volume Name: {args.volname}")
print(f" App Bundle: {app_path}")
print(f" Background: {bg_path}")
print(f" Window Size: {win_w}x{win_h}")
print(f" App Position: ({app_x}, {app_y})")
print(f" Apps Position: ({apps_x}, {apps_y})")
print(f" Output Path: {output_path}")
try:
dmgbuild.build_dmg(output_path, args.volname, settings=settings)
except Exception as e:
print(f"Error: dmgbuild failed: {e}", file=sys.stderr)
sys.exit(1)
if not os.path.isfile(output_path):
print(f"Error: Expected output DMG file '{output_path}' was not created", file=sys.stderr)
sys.exit(1)
size_mb = os.path.getsize(output_path) / (1024 * 1024)
print(f"Successfully generated DMG ({size_mb:.2f} MB): {output_path}")
if __name__ == "__main__":
main()