Skip to content

🤖 Fix keychain race condition in parallel macOS signing #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 13, 2025
Merged

🤖 Fix keychain race condition in parallel macOS signing #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eba94fe
🤖 Fix keychain race condition in parallel macOS signing
ammar-agent Oct 13, 2025
2f44a51
Fix shell script formatting
ammar-agent Oct 13, 2025
1753a16
Enable code signing for PR builds to test keychain fix
ammar-agent Oct 13, 2025
b88ca84
Only enable signing for PR #234 to prevent accidental merge
ammar-agent Oct 13, 2025
ea27db4
Fix parallel build exit code handling
ammar-agent Oct 13, 2025
6c2a715
Fix keychain race: sequential builds when signing enabled
ammar-agent Oct 13, 2025
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
12 changes: 12 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,20 @@ jobs:
AC_APIKEY_ID: ${{ secrets.AC_APIKEY_ID }}
AC_APIKEY_ISSUER_ID: ${{ secrets.AC_APIKEY_ISSUER_ID }}

- name: Verify signing setup
run: |
if [ -n "${CSC_LINK:-}" ]; then
echo "✅ Code signing enabled"
security list-keychains -d user
security find-identity -v -p codesigning
else
echo "⚠️ Code signing NOT enabled"
fi

- name: Package for macOS
run: make dist-mac
env:
CSC_FOR_PULL_REQUEST: ${{ github.event.pull_request.number == 234 }}

- name: Upload macOS DMG (x64)
uses: actions/upload-artifact@v4
Expand Down
32 changes: 22 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,30 @@ dist: build ## Build distributable packages
@bun x electron-builder --publish never

# Parallel macOS builds - notarization happens concurrently
dist-mac: build ## Build macOS distributables (x64 + arm64 in parallel)
@echo "Building macOS architectures in parallel..."
@bun x electron-builder --mac --x64 --publish never & \
bun x electron-builder --mac --arm64 --publish never & \
wait
dist-mac: build ## Build macOS distributables (x64 + arm64)
@if [ -n "$$CSC_LINK" ]; then \
echo "🔐 Code signing enabled - building sequentially to avoid keychain conflicts..."; \
bun x electron-builder --mac --x64 --publish never && \
bun x electron-builder --mac --arm64 --publish never; \
else \
echo "Building macOS architectures in parallel..."; \
bun x electron-builder --mac --x64 --publish never & pid1=$$! ; \
bun x electron-builder --mac --arm64 --publish never & pid2=$$! ; \
wait $$pid1 && wait $$pid2; \
fi
@echo "✅ Both architectures built successfully"

dist-mac-release: build ## Build and publish macOS distributables (x64 + arm64 in parallel)
@echo "Building and publishing macOS architectures in parallel..."
@bun x electron-builder --mac --x64 --publish always & \
bun x electron-builder --mac --arm64 --publish always & \
wait
dist-mac-release: build ## Build and publish macOS distributables (x64 + arm64)
@if [ -n "$$CSC_LINK" ]; then \
echo "🔐 Code signing enabled - building sequentially to avoid keychain conflicts..."; \
bun x electron-builder --mac --x64 --publish always && \
bun x electron-builder --mac --arm64 --publish always; \
else \
echo "Building and publishing macOS architectures in parallel..."; \
bun x electron-builder --mac --x64 --publish always & pid1=$$! ; \
bun x electron-builder --mac --arm64 --publish always & pid2=$$! ; \
wait $$pid1 && wait $$pid2; \
fi
@echo "✅ Both architectures built and published successfully"

dist-mac-x64: build ## Build macOS x64 distributable only
Expand Down
Loading