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

bootstrap: improve error recovery flags to curl #129134

Merged
merged 5 commits into from
Aug 25, 2024

Conversation

lolbinarycat
Copy link
Contributor

alternative to #128459

fixes #110178

r? @Kobzol

@rustbot
Copy link
Collaborator

rustbot commented Aug 15, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Kobzol (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@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 Aug 15, 2024
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

Copy link
Contributor

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

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

Thanks, this seems like a much less invasive change! Left some comments.

src/bootstrap/bootstrap.py Outdated Show resolved Hide resolved
src/bootstrap/src/core/download.rs Outdated Show resolved Hide resolved
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@Kobzol
Copy link
Contributor

Kobzol commented Aug 24, 2024

Btw, you can run ./x test tidy to run the fast CI check that is performed after each push to a PR. And ./x fmt to reformat code.

@lolbinarycat
Copy link
Contributor Author

I know, but tidy takes an eternity to run on a hdd system.

@lolbinarycat
Copy link
Contributor Author

i think there's actually a bug in get_git_modified_files, actually, it's reporting a number that way too high. probably because the current branch is actually behind the local master branch, since i haven't rebased it since the last git pull.

@rust-log-analyzer

This comment has been minimized.

@lolbinarycat
Copy link
Contributor Author

i think there's actually a bug in get_git_modified_files, actually, it's reporting a number that way too high. probably because the current branch is actually behind the local master branch, since i haven't rebased it since the last git pull.

not a bug, just extremely bad ux. see #129528

@Kobzol
Copy link
Contributor

Kobzol commented Aug 24, 2024

Thanks! You can r=me once PR CI is green.

@bors delegate+

@bors
Copy link
Contributor

bors commented Aug 24, 2024

✌️ @lolbinarycat, you can now approve this pull request!

If @Kobzol told you to "r=me" after making some further change, please make that change, then do @bors r=@Kobzol

@lolbinarycat
Copy link
Contributor Author

@bors r=@Kobzol

@bors
Copy link
Contributor

bors commented Aug 25, 2024

📌 Commit 56adf87 has been approved by Kobzol

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 Aug 25, 2024
tgross35 added a commit to tgross35/rust that referenced this pull request Aug 25, 2024
bootstrap: improve error recovery flags to curl

alternative to rust-lang#128459

fixes rust-lang#110178

r? `@Kobzol`
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
Rollup of 8 pull requests

Successful merges:

 - rust-lang#126985 (Implement `-Z embed-source` (DWARFv5 source code embedding extension))
 - rust-lang#128935 (More work on `zstd` compression)
 - rust-lang#129134 (bootstrap: improve error recovery flags to curl)
 - rust-lang#129190 (Add f16 and f128 to tests/ui/consts/const-float-bits-conv.rs)
 - rust-lang#129416 (library: Move unstable API of new_uninit to new features)
 - rust-lang#129418 (rustc: Simplify getting sysroot library directory)
 - rust-lang#129459 (handle stage0 `cargo` and `rustc` separately)
 - rust-lang#129511 (Update minifier to 0.3.1)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 25, 2024
bootstrap: improve error recovery flags to curl

alternative to rust-lang#128459

fixes rust-lang#110178

r? ``@Kobzol``
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128919 (Add an internal lint that warns when accessing untracked data)
 - rust-lang#129134 (bootstrap: improve error recovery flags to curl)
 - rust-lang#129416 (library: Move unstable API of new_uninit to new features)
 - rust-lang#129459 (handle stage0 `cargo` and `rustc` separately)
 - rust-lang#129487 (repr_transparent_external_private_fields: special-case some std types)
 - rust-lang#129511 (Update minifier to 0.3.1)
 - rust-lang#129523 (Make `rustc_type_ir` build on stable)
 - rust-lang#129546 (Get rid of `predicates_defined_on`)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 25, 2024
bootstrap: improve error recovery flags to curl

alternative to rust-lang#128459

fixes rust-lang#110178

r? ```@Kobzol```
lolbinarycat added a commit to lolbinarycat/rust that referenced this pull request Aug 25, 2024
also fixes a discrepency where the rust side doesn't use -L

must not be merged before rust-lang#129134

docs are only on the rust side, since duplicated prose
has a tendancy to get out-of-sync, and also because there
are talks of removing the python script all together eventually.
lolbinarycat added a commit to lolbinarycat/rust that referenced this pull request Aug 25, 2024
also fixes a discrepency where the rust side doesn't use -L

must not be merged before rust-lang#129134

docs are only on the rust side, since duplicated prose
has a tendancy to get out-of-sync, and also because there
are talks of removing the python script all together eventually.
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#129091 (add Box::as_ptr and Box::as_mut_ptr methods)
 - rust-lang#129134 (bootstrap: improve error recovery flags to curl)
 - rust-lang#129416 (library: Move unstable API of new_uninit to new features)
 - rust-lang#129459 (handle stage0 `cargo` and `rustc` separately)
 - rust-lang#129487 (repr_transparent_external_private_fields: special-case some std types)
 - rust-lang#129511 (Update minifier to 0.3.1)
 - rust-lang#129523 (Make `rustc_type_ir` build on stable)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#129091 (add Box::as_ptr and Box::as_mut_ptr methods)
 - rust-lang#129134 (bootstrap: improve error recovery flags to curl)
 - rust-lang#129416 (library: Move unstable API of new_uninit to new features)
 - rust-lang#129459 (handle stage0 `cargo` and `rustc` separately)
 - rust-lang#129487 (repr_transparent_external_private_fields: special-case some std types)
 - rust-lang#129511 (Update minifier to 0.3.1)
 - rust-lang#129523 (Make `rustc_type_ir` build on stable)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8e27d4c into rust-lang:master Aug 25, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 25, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
Rollup merge of rust-lang#129134 - lolbinarycat:continue-at, r=Kobzol

bootstrap: improve error recovery flags to curl

alternative to rust-lang#128459

fixes rust-lang#110178

r? ````@Kobzol````
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.

bootstrap doesn't retry downloads that fail with a non-HTTP error
5 participants