refactor: harden how ShipIt is launched and re-launched#306
Closed
MarshallOfSound wants to merge 1 commit into
Closed
refactor: harden how ShipIt is launched and re-launched#306MarshallOfSound wants to merge 1 commit into
MarshallOfSound wants to merge 1 commit into
Conversation
c81b054 to
7a9582a
Compare
11f3e97 to
13c624e
Compare
13c624e to
175faf8
Compare
7a9582a to
0d46ed1
Compare
175faf8 to
c6e71c6
Compare
MarshallOfSound
added a commit
that referenced
this pull request
May 3, 2026
…310) Fixes the intermittent `SQRLTerminationListenerSpec` failures the matrix CI surfaced (#305, #306). `launchApplicationAtURL:` returns immediately while the spawned process is still doing its `NSApplication` startup. `-[SQRLTerminationListener waitForTermination]` then calls `runningApplicationsWithBundleIdentifier:` — if the app hasn't checked in with Launch Services yet, that returns an empty array and the signal completes immediately. Both observed failure modes are this same window: - `observedApp == nil` + `completed == YES` from the start (one-instance test) - `completed` going true after only one of two terminates (multi-instance — listener only saw one app at subscribe time) Block in the fixture until `app.finishedLaunching` so every caller (these two specs plus the seven `SKIP_IF_RUNNING_ON_TRAVIS`-tagged `SQRLUpdaterSpec` cases) sees a stable starting state.
[upstream] electron/patches/squirrel.mac/refactor_use_posix_spawn_instead_of_nstask_so_we_can_disclaim_the.patch [upstream] electron/patches/squirrel.mac/fix_trigger_shipit_mach_service_after_smjobsubmit_to_unblock.patch [upstream] electron/patches/squirrel.mac/chore_turn_off_launchapplicationaturl_deprecation_errors_in_squirrel.patch - ShipIt-main.m: use posix_spawn with the responsibility-disclaim flag when re-spawning the post-install relauncher so a hot-swapped binary can't inherit the parent's TCC permissions - SQRLShipItLauncher.m: after SMJobSubmit, send a one-shot Mach message to the registered service so launchd starts the job even when the user domain is in on-demand-only mode (pending OS update) - ShipIt-main.m: pragma-suppress the launchApplicationAtURL deprecation (replacement is 10.15+; tracked at electron/electron#43168) No new specs: launchd / TCC / mach-port behaviour isn't reachable in a unit test. Existing remote-ShipIt SQRLInstallerSpec specs continue to exercise the new spawn path.
0422f0b to
69a0e8c
Compare
c6e71c6 to
5a93a10
Compare
This was referenced May 3, 2026
Collaborator
Author
|
Folded into #312. |
MarshallOfSound
added a commit
that referenced
this pull request
May 3, 2026
Upstreams the remaining `electron/patches/squirrel.mac/` patches into this repo so Electron can eventually drop them. Six commits, **8 files, +537/−51**, **63 → 74 tests**. | Commit | Upstreams | Tests added | |---|---|---| | `feat: SquirrelMacEnableDirectContentsWrite` | `feat_add_new_squirrel_mac_bundle_installation_method_behind_flag` | parent-dir-untouched e2e | | `fix: abort install if app running; resolve target path once` | `fix_abort_installation_attempt_at_the_final_mile_if_the_app_is` + `fix_resolve_target_bundle_path_once_at_start_of_install` | symlink-target rejected, abort-if-running | | `feat: ElectronSquirrelPreventDowngrades` | `feat_add_ability_to_prevent_version_downgrades` | `+isVersionAllowedForUpdate:from:` units | | `refactor: harden ShipIt launch` | `refactor_use_posix_spawn_instead_of_nstask…` + `fix_trigger_shipit_mach_service_after_smjobsubmit…` + `chore_turn_off_launchapplicationaturl_deprecation…` | (existing remote-ShipIt spec exercises new path) | | `refactor: non-deprecated NSKeyedArchiver` | `refactor_use_non-deprecated_nskeyedarchiver_apis` | `SQRLInstallerOwnedBundle` round-trip | | `fix: prune orphaned staged updates` | `fix_clean_up_orphaned_staged_updates_before_downloading_new_update` | unit prune + e2e bounded-count; replaces `xit` | Fixes #124. Fixes #196. Fixes #264. > [!NOTE] > Two adaptations should be backported to Electron's patches: > - `SQRLUpdater.m`: `BOOL launchPrivileged = !targetWritable` in the original `direct-contents-write` patch shadowed the outer var — it was a dead store > - `SQRLInstaller.m`: `runningApplicationsWithBundleIdentifier:` throws on `nil`; guarded it Replaces the stacked #303 / #304 / #305 / #306 / #307 / #309. #302 (strict codesign validation) stays separate — it touches only `SQRLCodeSignature.m`.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stacked on #305.
Upstreams
refactor_use_posix_spawn_instead_of_nstask_so_we_can_disclaim_the.patch+fix_trigger_shipit_mach_service_after_smjobsubmit_to_unblock.patch+chore_turn_off_launchapplicationaturl_deprecation_errors_in_squirrel.patch. No new specs — launchd/TCC/mach not unit-reachable; existing remote-ShipItSQRLInstallerSpecexercises the new posix_spawn path.Part of upstreaming
electron/patches/squirrel.mac/into this repo.Fixes #196.