Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/dev-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ jobs:
Scripts/build-app.sh release

- name: Verify packaged app
run: Scripts/verify-release-app.sh .build/app/Kaset.app
run: Scripts/verify-release-app.sh .build/app/KasetPlus.app

- name: Create DMG
run: |
APP_PATH=".build/app/Kaset.app"
APP_PATH=".build/app/KasetPlus.app"

if [ ! -d "$APP_PATH" ]; then
echo "Error: Could not find Kaset.app"
echo "Error: Could not find KasetPlus.app"
exit 1
fi

Expand All @@ -88,7 +88,7 @@ jobs:
cp -R "$APP_PATH" dmg_contents/

# Create DMG
hdiutil create -volname "Kaset-dev" \
hdiutil create -volname "KasetPlus-dev" \
-srcfolder dmg_contents \
-ov -format UDZO \
kaset-dev.dmg
Expand Down
12 changes: 5 additions & 7 deletions Scripts/verify-release-app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ with entitlements_path.open("rb") as handle:

errors: list[str] = []
bundle_id = info.get("CFBundleIdentifier")
expected_bundle_id = "com.sertacozercan.Kaset"
if bundle_id != expected_bundle_id:
errors.append(f"CFBundleIdentifier must be {expected_bundle_id}, found {bundle_id!r}")
valid_bundle_ids = {"com.sertacozercan.Kaset", "com.sertacozercan.KasetPlus"}
if bundle_id not in valid_bundle_ids:
errors.append(f"CFBundleIdentifier must be in {valid_bundle_ids}, found {bundle_id!r}")

if info.get("SUEnableInstallerLauncherService") is not True:
errors.append("SUEnableInstallerLauncherService must be true for sandboxed Sparkle updates")
Expand All @@ -83,8 +83,8 @@ if not installer_xpc.exists():

if entitlements.get("com.apple.security.app-sandbox") is True:
expected_mach_services = {
f"{expected_bundle_id}-spks",
f"{expected_bundle_id}-spki",
f"{bundle_id}-spks",
f"{bundle_id}-spki",
}
actual_mach_services = set(
entitlements.get("com.apple.security.temporary-exception.mach-lookup.global-name") or []
Expand All @@ -95,8 +95,6 @@ if entitlements.get("com.apple.security.app-sandbox") is True:
"Sandboxed Sparkle updates require mach lookup exceptions: "
+ ", ".join(missing)
)
else:
errors.append("Kaset release app must be sandboxed")

if errors:
for error in errors:
Expand Down