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

Label more build steps #92182

Merged
merged 2 commits into from
Jan 5, 2022
Merged

Label more build steps #92182

merged 2 commits into from
Jan 5, 2022

Conversation

nnethercote
Copy link
Contributor

Some small improvements.

r? @Mark-Simulacrum

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 22, 2021
jyn514
jyn514 suggested changes Dec 22, 2021
View reviewed changes
src/bootstrap/flags.rs Outdated Show resolved Hide resolved
src/bootstrap/bootstrap.py Outdated Show resolved Hide resolved
@jyn514 jyn514 added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Dec 22, 2021
@Mark-Simulacrum Mark-Simulacrum 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 Dec 28, 2021
@nnethercote
Label more build steps.
10e3d92 
Currently the output of a command like `./x.py build --stage 0 library/std` is this:
```
Updating only changed submodules
Submodules updated in 0.02 seconds
extracting [...]
   Compiling [...]
    Finished dev [unoptimized] target(s) in 17.53s
Building stage0 std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
   Compling [...]
    Finished release [optimized + debuginfo] target(s) in 21.99s
Copying stage0 std from stage0 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
Build completed successfully in 0:00:51
```
I find the part before the "Building stage0 std artifacts" a bit confusing.

After this commit, it looks like this:
```
Updating only changed submodules
  Submodules updated in 0.02 seconds
extracting [...]
Building rustbuild
   Compiling [...]
    Finished dev [unoptimized] target(s) in 17.53s
Building stage0 std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
   Compling [...]
    Finished release [optimized + debuginfo] target(s) in 21.99s
Copying stage0 std from stage0 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
Build completed successfully in 0:00:51
```
The "Building rustbuild" label makes it clear what the first cargo build
invocation is for. The indentation of the "Submodules updated" line
indicates it is a sub-step of a parent task.
@nnethercote
Tweak the usage messages for x.py build and x.py check.
2e74ca1 
They're a bit out of date, and overly complicated.
@nnethercote
Copy link
Contributor Author

Updated, thanks for the suggestions.

r? @Mark-Simulacrum

@nnethercote nnethercote 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 Jan 3, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 4, 2022

📌 Commit 2e74ca1 has been approved by Mark-Simulacrum

@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 Jan 4, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 4, 2022
@matthiaskrgr
Rollup merge of rust-lang#92182 - nnethercote:label-more-build-steps,…
a304de6 
… r=Mark-Simulacrum

Label more build steps

Some small improvements.

r? `@Mark-Simulacrum`
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 4, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 5, 2022
@matthiaskrgr
Rollup merge of rust-lang#92182 - nnethercote:label-more-build-steps,…
152e1e5 
… r=Mark-Simulacrum

Label more build steps

Some small improvements.

r? ``@Mark-Simulacrum``
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 5, 2022
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 5, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 5, 2022
@bors
Auto merge of rust-lang#92580 - matthiaskrgr:rollup-nzyn65y, r=matthi…
181e915 
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#92182 (Label more build steps)
 - rust-lang#92188 (rustdoc: Clean up NestedAttributesExt trait/implementation)
 - rust-lang#92322 (Add another implementation example to Debug trait)
 - rust-lang#92448 (Set font size proportional to user's font size)
 - rust-lang#92517 (Explicitly pass `PATH` to the Windows exe resolver)
 - rust-lang#92545 (Extract init_env_logger to crate)
 - rust-lang#92579 (update Miri)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e35a4bd into rust-lang:master Jan 5, 2022
@rustbot rustbot added this to the 1.59.0 milestone Jan 5, 2022
@nnethercote nnethercote deleted the label-more-build-steps branch January 5, 2022 20:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

@jyn514 jyn514 jyn514 requested changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

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
Milestone
1.59.0
Development

Successfully merging this pull request may close these issues.
6 participants
@nnethercote @Mark-Simulacrum @bors @jyn514 @rust-highfive @rustbot