-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
move env var handling into rust and expose summarize env as a command #4364
Merged
+77
−13
Merged
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7d6a2af
move env var handling into rust and expose summarize env as a command
arlyon 85f3c6b
fix cli integration tests to be aware of flags
arlyon c291a7e
Merge branch 'main' into refactor/go-flag
mehulkar 686ce44
add test cases
mehulkar 02a9db7
actually use the flag
mehulkar f628041
back out other flags
mehulkar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
Setup | ||
$ . ${TESTDIR}/../../setup.sh | ||
$ . ${TESTDIR}/../setup.sh $(pwd) | ||
|
||
# Delete all run summaries to start | ||
$ rm -rf .turbo/runs | ||
|
||
# Tests | ||
| env var | flag | summary? | | ||
| ------- | ------- | -------- | | ||
| true | missing | yes | | ||
| true | true | yes | | ||
| true | false | no | | ||
|
||
| false | missing | no | | ||
| false | true | yes | | ||
| false | false | no | | ||
|
||
| missing | missing | no | | ||
| missing | true | yes | | ||
| missing | false | no | | ||
|
||
|
||
# env var=true, no flag: yes | ||
$ rm -rf .turbo/runs | ||
$ TURBO_RUN_SUMMARY=true ${TURBO} run build > /dev/null | ||
$ /bin/ls .turbo/runs/*.json | wc -l | ||
\s*1 (re) | ||
# env var=true, --flag=true: yes | ||
$ rm -rf .turbo/runs | ||
$ TURBO_RUN_SUMMARY=true ${TURBO} run build > /dev/null | ||
$ /bin/ls .turbo/runs/*.json | wc -l | ||
\s*1 (re) | ||
# env var=true, --flag=false: no | ||
$ rm -rf .turbo/runs | ||
$ TURBO_RUN_SUMMARY=true ${TURBO} run build > /dev/null | ||
$ test -d .turbo/runs | ||
[1] | ||
|
||
# env var=false, no flag, no | ||
$ rm -rf .turbo/runs | ||
$ TURBO_RUN_SUMMARY=false ${TURBO} run build > /dev/null | ||
$ test -d .turbo/runs | ||
[1] | ||
# env var=false, --flag=true: yes | ||
$ rm -rf .turbo/runs | ||
$ TURBO_RUN_SUMMARY=false ${TURBO} run build > /dev/null | ||
$ /bin/ls .turbo/runs/*.json | wc -l | ||
\s*1 (re) | ||
# env var=false, --flag=false: no | ||
$ rm -rf .turbo/runs | ||
$ TURBO_RUN_SUMMARY=false ${TURBO} run build > /dev/null | ||
$ test -d .turbo/runs | ||
[1] | ||
|
||
# no env var, no flag: no | ||
$ rm -rf .turbo/runs | ||
$ ${TURBO} run build > /dev/null | ||
$ test -d .turbo/runs | ||
[1] | ||
# no env var, --flag=true: yes | ||
$ rm -rf .turbo/runs | ||
$ ${TURBO} run build > /dev/null | ||
$ /bin/ls .turbo/runs/*.json | wc -l | ||
\s*1 (re) | ||
# no env var, --flag=false: no | ||
$ rm -rf .turbo/runs | ||
$ ${TURBO} run build > /dev/null | ||
$ test -d .turbo/runs | ||
[1] |
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,6 @@ package run | |
import ( | ||
gocontext "context" | ||
"fmt" | ||
"os" | ||
"sort" | ||
"sync" | ||
"time" | ||
|
@@ -81,6 +80,7 @@ func optsFromArgs(args *turbostate.ParsedArgsFromRust) (*Opts, error) { | |
opts.cacheOpts.OverrideDir = runPayload.CacheDir | ||
opts.cacheOpts.Workers = runPayload.CacheWorkers | ||
opts.runOpts.logPrefix = runPayload.LogPrefix | ||
opts.runOpts.summarize = runPayload.Summarize | ||
opts.runOpts.experimentalSpaceID = runPayload.ExperimentalSpaceID | ||
|
||
// Runcache flags | ||
|
@@ -136,18 +136,6 @@ func optsFromArgs(args *turbostate.ParsedArgsFromRust) (*Opts, error) { | |
} | ||
|
||
func configureRun(base *cmdutil.CmdBase, opts *Opts, signalWatcher *signals.Watcher) *run { | ||
if os.Getenv("TURBO_FORCE") == "true" { | ||
opts.runcacheOpts.SkipReads = true | ||
} | ||
|
||
if os.Getenv("TURBO_REMOTE_ONLY") == "true" { | ||
opts.cacheOpts.SkipFilesystem = true | ||
} | ||
mehulkar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
if os.Getenv("TURBO_RUN_SUMMARY") == "true" { | ||
opts.runOpts.summarize = true | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the clap bool parser is more permissive and will consider stuff like |
||
|
||
processes := process.NewManager(base.Logger.Named("processes")) | ||
signalWatcher.AddOnClose(processes.Close) | ||
return &run{ | ||
|
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure for sure that this is the right result for each combination, but it's a starting point
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All of these outcomes looks solid to me.