Skip to content

misc bootstrap cleanups #113644

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
Merged
merged 4 commits into from
Jul 15, 2023
Merged

misc bootstrap cleanups #113644

merged 4 commits into from
Jul 15, 2023

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Jul 13, 2023

  • rename detail_exit_macro to exit
  • remove unnecessary Builder::new_standalone function
  • support x suggest with build-metrics

@rustbot
Copy link
Collaborator

rustbot commented Jul 13, 2023

r? @albertlarsan68

(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 Jul 13, 2023
albertlarsan68
albertlarsan68 approved these changes Jul 13, 2023
View reviewed changes
Copy link
Member

@albertlarsan68 albertlarsan68 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM, I just would want the suggested run build metric quirk to be documented somewhere, like in the --help output

@albertlarsan68 albertlarsan68 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 Jul 13, 2023
@jyn514
Fix x suggest --run
dc48a8b 
i broke this in the previous commit; and metrics never worked until i switched from `execute_cli` to build
@jyn514
Copy link
Member Author

jyn514 commented Jul 14, 2023

i changed x suggest to properly support metrics. the clone hack should no longer be visible in the metrics file.

@jyn514 jyn514 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 Jul 14, 2023
@albertlarsan68
Copy link
Member

Thanks for the PR!
@bors r+

@bors
Copy link
Collaborator

bors commented Jul 15, 2023

📌 Commit dc48a8b has been approved by albertlarsan68

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 Jul 15, 2023
@bors
Copy link
Collaborator

bors commented Jul 15, 2023

⌛ Testing commit dc48a8b with merge 7943653d6d44ed5c86f0b148fd5a001114be4b93...

@bors
Copy link
Collaborator

bors commented Jul 15, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 15, 2023
@rust-log-analyzer
Copy link
Collaborator

The job armhf-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
curl: (22) The requested URL returned error: 404 

error: failed to download llvm from ci

    help: old builds get deleted after a certain time
    help: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml:
    [llvm]
    download-ci-llvm = false
    
Build completed unsuccessfully in 0:00:00

@albertlarsan68
Copy link
Member

@bors retry maybe supurious, or has CI really expired?

@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 Jul 15, 2023
@bors
Copy link
Collaborator

bors commented Jul 15, 2023

⌛ Testing commit dc48a8b with merge e0d46be9986eac12114ca5edfecf121da0e8932a...

@bors
Copy link
Collaborator

bors commented Jul 15, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 15, 2023
@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
curl: (22) The requested URL returned error: 404

error: failed to download llvm from ci

    help: old builds get deleted after a certain time
    help: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml:
    [llvm]
    download-ci-llvm = false
    
Build completed unsuccessfully in 0:00:00

@albertlarsan68
Copy link
Member

@bors retry (tree closed, but will be resolved (#113713))

@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 Jul 15, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 15, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 15, 2023
@bors
Auto merge of rust-lang#113732 - matthiaskrgr:rollup-nm5qy4i, r=matth…
425726d 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#113625 (Structurally normalize in selection)
 - rust-lang#113644 (misc bootstrap cleanups)
 - rust-lang#113663 (Implement "items do not inherit unsafety" note for THIR unsafeck)
 - rust-lang#113683 (remove outdated `FIXME`s in bootstrap internals)
 - rust-lang#113709 (rustdoc: use src consistently over source in CSS/JS)
 - rust-lang#113724 (Migrate GUI colors test to original CSS color format)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e76ae3e into rust-lang:master Jul 15, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@albertlarsan68 albertlarsan68 albertlarsan68 approved these changes

Assignees

@albertlarsan68 albertlarsan68

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.73.0
Development

Successfully merging this pull request may close these issues.
5 participants
@jyn514 @rustbot @albertlarsan68 @bors @rust-log-analyzer