Commit d0a9b49
authored
fix(desktop): make electronDist override opt-in to unbreak nightly codesign (#863)
PR #698 unconditionally passed --config.electronDist pointing at the
electron package's dist directory inside the pnpm store. On the macOS
arm64 nightly runner, electron-builder copies Electron.app from that
path into the release output, but the framework version symlinks
(Electron Framework.framework/Versions/Current → A, etc.) do not survive
the copy out of the pnpm content-addressable store. The resulting
framework bundle has both top-level files and a Versions/ directory,
which causes codesign to fail with:
Electron Framework: bundle format is ambiguous
(could be app or framework)
The 04-07 nightly run (24058395128) hit this and codesign hung for
~6 minutes before exiting. The 04-06 run (pre-#698) succeeded.
Restore the previous behavior: only forward --config.electronDist to
electron-builder when NEXU_DESKTOP_ELECTRON_DIST_PATH is explicitly set
(the e2e coverage tooling use case). Otherwise let electron-builder
resolve electron via its default pnpm-aware path, which preserves
framework symlinks correctly.1 parent 28eb4bc commit d0a9b49
1 file changed
Lines changed: 14 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
119 | 125 | | |
120 | | - | |
121 | | - | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
122 | 129 | | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
| 130 | + | |
| 131 | + | |
130 | 132 | | |
131 | 133 | | |
132 | 134 | | |
| |||
805 | 807 | | |
806 | 808 | | |
807 | 809 | | |
808 | | - | |
| 810 | + | |
| 811 | + | |
| 812 | + | |
809 | 813 | | |
810 | 814 | | |
811 | 815 | | |
| |||
0 commit comments