Skip to content

Revert to upstream keytar to fix broken x86 macOS build#93

Merged
pol-rivero merged 1 commit intomainfrom
test-keytar-rebuild
Mar 20, 2026
Merged

Revert to upstream keytar to fix broken x86 macOS build#93
pol-rivero merged 1 commit intomainfrom
test-keytar-rebuild

Conversation

@pol-rivero
Copy link
Owner

No description provided.

Copilot AI review requested due to automatic review settings March 18, 2026 20:41
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the CI workflow to explicitly rebuild the keytar-forked-forked native module during the build job, intended to ensure the module is built correctly for x86 (x64) macOS targets.

Changes:

  • Add a CI step to run @electron/rebuild for keytar-forked-forked.
  • Parameterize the rebuild by the matrix architecture (${{ matrix.arch }}).

@pol-rivero pol-rivero force-pushed the test-keytar-rebuild branch 2 times, most recently from 4f3c308 to 62d2319 Compare March 20, 2026 21:14
keytar-forked-forked seems to be broken in x86 macOS (actually compiled as arm64).
Support for 32-bit arm is no longer required.
@pol-rivero pol-rivero force-pushed the test-keytar-rebuild branch from 62d2319 to c39be71 Compare March 20, 2026 21:14
@pol-rivero pol-rivero merged commit 47e78b6 into main Mar 20, 2026
2 of 15 checks passed
@pol-rivero pol-rivero changed the title Rebuild keytar for x86 macOS Revert to upstream keytar to fix broken x86 macOS build Mar 20, 2026
@pol-rivero pol-rivero deleted the test-keytar-rebuild branch March 20, 2026 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants