Skip to content

Commit c642967

Browse files
fix(ci): unblock macOS dev-release prereqs (#1231)
* fix(ci): unblock macOS dev-release prereqs * fix(ci): preserve entitlements under hardened runtime
1 parent 411061f commit c642967

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,12 @@ uninstall:
131131
test:
132132
@for module in $(TESTABLES); do \
133133
echo "Running tests for $$module"; \
134-
poetry run make -C $$module test || { echo "Error in $$module tests"; exit 2; }; \
135-
done
134+
if [ -f "$$module/pyproject.toml" ]; then \
135+
(cd $$module && poetry run make test) || { echo "Error in $$module tests"; exit 2; }; \
136+
else \
137+
make -C $$module test || { echo "Error in $$module tests"; exit 2; }; \
138+
fi; \
139+
done
136140

137141
test-integration:
138142
# TODO: Move "integration tests" to aw-client

scripts/package/build_app_tauri.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,10 @@ echo "APPL????" > "dist/${APP_NAME}.app/Contents/PkgInfo"
9696

9797
if [ -n "$APPLE_PERSONALID" ]; then
9898
echo "Signing app with identity: $APPLE_PERSONALID"
99-
codesign --deep --force --sign "$APPLE_PERSONALID" "dist/${APP_NAME}.app"
99+
# Hardened runtime is required for notarization prechecks on macOS.
100+
# The Tauri bundle still embeds PyInstaller-built helpers from dist/activitywatch/,
101+
# so keep the existing entitlements that those binaries need under hardened runtime.
102+
codesign --deep --force --options runtime --entitlements scripts/package/entitlements.plist --sign "$APPLE_PERSONALID" "dist/${APP_NAME}.app"
100103
echo "App signing complete."
101104
else
102105
echo "APPLE_PERSONALID not set. Skipping code signing."

0 commit comments

Comments
 (0)