Skip to content
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

Jump to bottom

Configure tty output correctly #1209

Merged
merged 2 commits into from
Jul 10, 2023
Merged

Configure tty output correctly #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62eae49
configure tty output correctly
Jul 10, 2023
cdebfb4
changelog entry
Jul 10, 2023
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Dry-run result output improvements [1123](https://github.com/paritytech/cargo-contract/pull/1123)

### Fixed
- Configure tty output correctly - [#1209]((https://github.com/paritytech/cargo-contract/pull/1209))


## [3.0.1]

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions crates/build/src/util/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ pub fn cargo_tty_output(cmd: Expression) -> Expression {
.map(|(width, _)| width.to_string())
.unwrap_or_else(|| "100".to_string());

cmd.env("CARGO_TERM_COLOR", "always")
cmd.env("CARGO_TERM_COLOR", "auto")
.env("CARGO_TERM_PROGRESS_WIDTH", term_size)
.env("CARGO_TERM_PROGRESS_WHEN", "always")
.env("CARGO_TERM_PROGRESS_WHEN", "auto")
Comment on lines +107 to +109
Copy link
Collaborator

@ascjones ascjones Jul 10, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Interesting that this actually works to still correctly detect and display the colour and progress bar, the docs say that the default is auto and yet it does not work when we don't explicitly set it. 🤷

We could go a step further here and pass in the verbosity to this function so that it only sets the TERM_PROGRESS vars when it is not Verbosity::Quiet

}

/// Returns the base name of the path.
Expand Down