internal/setup: move sudo into SudoDevbox function + fix macOS CI #2043
Conversation
This file contains 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
gcurtis
changed the title
mikeland73
approved these changes
May 10, 2024
Comment on lines
+168
to
+175
| "XDG_CACHE_HOME", | ||
| "XDG_CONFIG_DIRS", | ||
| "XDG_CONFIG_HOME", | ||
| "XDG_DATA_DIRS", | ||
| "XDG_DATA_HOME", | ||
| "XDG_RUNTIME_DIR", | ||
| "XDG_STATE_HOME", |
There was a problem hiding this comment.
Are there no issues with propagating all of these?
There was a problem hiding this comment.
I don't think so. Were you thinking of something specific? I added them in case the user has their XDG directories customized. Otherwise devbox cache credentials will use the default dirs.
Move the code that calls `sudo devbox` into the `setup` package and clean it up a bit. Fix some issues that were preventing the cache from being configured in non-interactive environments (such as CI). - Don't re-prompt the user for confirmation in the sudo process. - Don't call NeedsRun a second time in the sudo process. - Don't prompt the user when stdin isn't a tty. This fixes cache configuration on macOS in CI. - Preserve Devbox environment variables such as DEVBOX_DEBUG, DEVBOX_API_TOKEN, DEVBOX_PROD, and DEVBOX_USE_VERSION. This addresses edge cases where the sudo devbox process would use the wrong auth or API endpoint. - Combine the nixcache aws and nix setup tasks into one task. There was a lot of overlap and this simplifies the setup code.
Suspect IssuesThis pull request was deployed and Sentry observed the following issues:
Did you find this useful? React with a 👍 or 👎 |
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.
Move the code that calls
sudo devboxinto thesetuppackage and clean it up a bit. Fix some issues that were preventing the cache from being configured in non-interactive environments (such as CI).Reran the
cache-uploadworkflow against this branch and it looks like the macOS runner is able to use the cache now - https://github.com/jetify-com/devbox/actions/runs/9022662173/job/24792707507#step:5:828