这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: respect output mode 'none' even when caching is disabled #9670

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.

Sign up for GitHub

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

Merged
merged 16 commits into from
Jan 10, 2025
Merged

fix: respect output mode 'none' even when caching is disabled #9670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9a6ce31
fix: respect output mode 'none' even when caching is disabled
anthonyshew Jan 3, 2025
2f814be
WIP
anthonyshew Jan 3, 2025
7098d5b
WIP
anthonyshew Jan 3, 2025
e3cd1e0
WIP
anthonyshew Jan 3, 2025
cf21275
WIP
anthonyshew Jan 3, 2025
388bde2
WIP
anthonyshew Jan 3, 2025
d707817
WIP
anthonyshew Jan 3, 2025
38e3eaa
WIP
anthonyshew Jan 3, 2025
aa08d93
WIP
anthonyshew Jan 3, 2025
077c3d5
WIP
anthonyshew Jan 3, 2025
8fa23be
WIP
anthonyshew Jan 3, 2025
6862f13
Merge branch 'main' into shew-bae6f
anthonyshew Jan 3, 2025
75eb988
WIP
anthonyshew Jan 3, 2025
bfb50c3
Merge branch 'shew-bae6f' of https://github.com/vercel/turborepo into…
anthonyshew Jan 3, 2025
03b8e1f
Update crates/turborepo-lib/src/run/cache.rs
anthonyshew Jan 9, 2025
e26fbb8
Merge branch 'main' into shew-bae6f
anthonyshew Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions crates/turborepo-lib/src/run/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,18 +196,15 @@ impl TaskCache {
pub fn output_writer<W: Write>(&self, writer: W) -> Result<LogWriter<W>, Error> {
let mut log_writer = LogWriter::default();

if self.caching_disabled || self.run_cache.writes_disabled {
log_writer.with_writer(writer);
return Ok(log_writer);
if !self.caching_disabled && !self.run_cache.writes_disabled {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Translating this for myself: "if a task has "cache": true and is run at least one cache it can write to"

This is changed from: "if task has "cache": false or cannot write to disk"

log_writer.with_log_file(&self.log_file_path)?;
}

log_writer.with_log_file(&self.log_file_path)?;

if !matches!(
self.task_output_logs,
OutputLogsMode::None | OutputLogsMode::HashOnly | OutputLogsMode::ErrorsOnly
) {
log_writer.with_writer(writer);
match self.task_output_logs {
OutputLogsMode::None | OutputLogsMode::HashOnly | OutputLogsMode::ErrorsOnly => {}
OutputLogsMode::Full | OutputLogsMode::NewOnly => {
log_writer.with_writer(writer);
}
}

Ok(log_writer)
Expand Down
11 changes: 8 additions & 3 deletions crates/turborepo-ui/src/logs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,14 @@ impl<W: Write> Write for LogWriter<W> {
(Some(log_file), None) => log_file.write(buf),
(None, Some(prefixed_writer)) => prefixed_writer.write(buf),
(None, None) => {
// Should this be an error or even a panic?
debug!("no log file or prefixed writer");
Ok(0)
debug!(
"No log file or prefixed writer to write to. This should only happen when \
both caching is disabled and output logs are set to none."
);

// Returning the buffer's length so callers don't think this is a failure to
// create the buffer
Ok(buf.len())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch! This was dead code before so we were never hitting the bad return of Ok(0), thanks for fixing up my mistake.

}
}
}
Expand Down
13 changes: 13 additions & 0 deletions turborepo-tests/integration/tests/run-logging/no-cache-and-no-output-logs.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Setup
$ . ${TESTDIR}/../../../helpers/setup_integration_test.sh run_logging

$ ${TURBO} run build --cache=local:,remote: --output-logs=none
WARNING no caches are enabled
\xe2\x80\xa2 Packages in scope: app-a (esc)
\xe2\x80\xa2 Running build in 1 packages (esc)
\xe2\x80\xa2 Remote caching disabled (esc)

Tasks: 1 successful, 1 total
Cached: 0 cached, 1 total
Time:\s*[\.0-9]+m?s (re)

Loading