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.

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

Improve building compiler artifacts output #108171

Merged
merged 1 commit into from
Feb 20, 2023

Conversation

mattjperez
Copy link
Contributor

Fixes #108051

@Manishearth, @jyn514 mentioned you might be interested in these changes to the outputs.

@rustbot
Copy link
Collaborator

rustbot commented Feb 17, 2023

r? @ozkanonur

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 17, 2023
Copy link
Member

@Manishearth Manishearth left a comment

Choose a reason for hiding this comment

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

yess.

One note; might be worth also having a message when a build stage finishes (or even when one fails) with the same information

@jyn514
Copy link
Member

jyn514 commented Feb 17, 2023

One note; might be worth also having a message when a build stage finishes (or even when one fails) with the same information

this is quite difficult to do unfortunately :( cc #86022 (comment)

@jyn514
Copy link
Member

jyn514 commented Feb 17, 2023

it turns out I had time for this after all

r? @jyn514

@rustbot rustbot assigned jyn514 and unassigned onur-ozkan Feb 17, 2023
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

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

this is awesome ❤️ ❤️ ❤️

some more things I tried that all worked great:

; x dist --dry-run clippy  
Building bootstrap
    Finished dev [unoptimized] target(s) in 0.04s
Building stage0 library artifacts (aarch64-apple-darwin) 
Building compiler artifacts (stage0 -> stage1)
Assembling stage1 compiler
Building stage1 library artifacts (aarch64-apple-darwin) 
Building compiler artifacts (stage1 -> stage2)
Building tool clippy-driver (stage1 -> stage2)
Building tool cargo-clippy (stage1 -> stage2)
Building tool rust-installer (stage0)
Dist clippy-1.69.0-dev-aarch64-apple-darwin
; x build --dry-run rustdoc miri --target x86_64-unknown-linux-gnu library
Building bootstrap
    Finished dev [unoptimized] target(s) in 0.04s
Building stage0 library artifacts (aarch64-apple-darwin) 
Building compiler artifacts (stage0 -> stage1)
Assembling stage1 compiler
Building stage1 library artifacts (aarch64-apple-darwin -> x86_64-unknown-linux-gnu)
Building rustdoc (stage0 -> stage1)
Building stage1 library artifacts (aarch64-apple-darwin) 
Building compiler artifacts (stage1 -> stage2)
Building tool miri (stage1 -> stage2)
; x t --stage 1 rustc_data_structures --dry-run
Building bootstrap
    Finished dev [unoptimized] target(s) in 0.15s
Building stage0 library artifacts (aarch64-apple-darwin) 
Building compiler artifacts (stage0 -> stage1)
Assembling stage1 compiler
Building stage1 library artifacts (aarch64-apple-darwin) 
Building rustdoc (stage0 -> stage1)
Testing {rustc_data_structures} stage1 (aarch64-apple-darwin -> aarch64-apple-darwin)

src/bootstrap/tool.rs Outdated Show resolved Hide resolved
src/bootstrap/tool.rs Outdated Show resolved Hide resolved
@jyn514
Copy link
Member

jyn514 commented Feb 17, 2023

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 17, 2023
@mattjperez
Copy link
Contributor Author

@jyn514 thanks for the feedback! I'm glad it's already proving a bit useful 😁

I wanted to get something up for review quickly in case there were mistakes.

I'll refactor this and mark it as ready when it's up.

@mattjperez mattjperez force-pushed the compiler-artifacts-output branch from 4e382f3 to 1b4f995 Compare February 18, 2023 19:21
@mattjperez
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 18, 2023
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

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

r=me with the nit fixed :)

fn tooling_output(
mode: Mode,
tool: &str,
stage: u32,
Copy link
Member

Choose a reason for hiding this comment

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

nit: because you're doing math on it, please name it build_stage. Then in the Rustdoc Step, you can pass in build_compiler.stage instead of doing math on target_compiler.stage.

@jyn514
Copy link
Member

jyn514 commented Feb 19, 2023

@bors delegate=mattjperez rollup (please use r=jyn514)

@bors
Copy link
Contributor

bors commented Feb 19, 2023

✌️ @mattjperez can now approve this pull request

@mattjperez mattjperez force-pushed the compiler-artifacts-output branch from 1b4f995 to 551b894 Compare February 19, 2023 14:12
@mattjperez mattjperez force-pushed the compiler-artifacts-output branch from 551b894 to 40f012a Compare February 19, 2023 14:16
@mattjperez
Copy link
Contributor Author

@bors r=jyn514 😁

@bors
Copy link
Contributor

bors commented Feb 19, 2023

📌 Commit 40f012a has been approved by jyn514

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 19, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 20, 2023
…ut, r=jyn514

Improve building compiler artifacts output

Fixes rust-lang#108051

`@Manishearth,` `@jyn514` mentioned you might be interested in these changes to the outputs.
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 20, 2023
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#108124 (Document that CStr::as_ptr returns a type alias)
 - rust-lang#108171 (Improve building compiler artifacts output)
 - rust-lang#108200 (Use restricted Damerau-Levenshtein distance for diagnostics)
 - rust-lang#108259 (remove FIXME that doesn't require fixing)
 - rust-lang#108265 ("`const` generic" -> "const parameter")

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1f5c2b1 into rust-lang:master Feb 20, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 20, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 26, 2023
…lbertlarsan68

bootstrap: Update the output of the `check` descriptions

This should bring the output from `x check` in line with the changes in rust-lang#108171
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Feb 26, 2023
…lbertlarsan68

bootstrap: Update the output of the `check` descriptions

This should bring the output from `x check` in line with the changes in rust-lang#108171
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 27, 2023
…lbertlarsan68

bootstrap: Update the output of the `check` descriptions

This should bring the output from `x check` in line with the changes in rust-lang#108171
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Improve "Building compiler artifacts" output
6 participants