chore: cherry-pick coder desktop + corporate vpn fixes for 2.24 #19177
Conversation
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
Work around for following issue:
```
Run sudo mdutil -a -i off
sudo mdutil -a -i off
sudo mdutil -X /
sudo launchctl bootout system /System/Library/LaunchDaemons/com.apple.metadata.mds.plist
shell: /bin/bash -e {0}
4 files/directories removed
Boot-out failed: 5: Input/output error
```
This can happen if spotlight has already been disabled.
16.0.0 was yanked from the macOS runners, so this will likely need cherry picking into the upcoming release branch. We've already checked everything builds fine on #19125. In a few releases we'll stop building the dylib and also therefore remove xcode as a dependency on coder/coder altogether.
Undoes a lot of the changes in 5319d47 Keeps the `netns.SetCoderSoftIsolation()` call, but always sets it to `true` when using a TUN device.
The sinks are already added to the logger above, so they're just getting duplicated
Continues to address coder/coder-desktop-macos#201 Identical to the windows command, except we don't write to stdio. We're retaining the system we have for logging on macOS, where we push logs over the tunnel and use the OS logger. I've tested that a build with this command works end-to-end with my new version of Coder Desktop macOS. Also brings in the soft net isolation changes from `main` of coder/tailscale.
This comment was marked as outdated.
This comment was marked as outdated.
deansheather
approved these changes
Aug 5, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This backports the coder/coder fixes for coder/coder-desktop-windows#147 and coder/coder-desktop-macos#201 to v2.24, and fixes a bug where Coder Desktop logs were duplicated on Windows.
c64b3c0d8327edbfad4cc7bc373bdb873cd7e26b)9f2dc72d9a3d9feecf28bc30cd1234394a0e5c37)914daac2dcf700817d4ae248a6e8014f64654fe7)618121cba39833db7c1ca4653d7ce7745d5aff57)ba0b124a1daaddde590f5839afebe803330981be)19171e27c9624c435f97d4ae5e3b61c649bc7063)vpn-daemon runcommand for macos #19080 (18b037d0086cd6eca11e6180b36a302badaa5a5f)I've tested my latest build of Coder Desktop against a Coder server running this branch, just as a sanity check.