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

rustbuild: take changes to the standard library into account for download-rustc #85996

Merged
merged 1 commit into from
Jun 7, 2021

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Jun 4, 2021

Previously, changing the standard library with download-rustc = "if-unchanged" would incorrectly reuse the cached compiler and standard
library from CI, which was confusing and led to incorrect test failures
or successes.

r? @Mark-Simulacrum

@jyn514 jyn514 added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-contributor-roadblock Area: Makes things more difficult for new contributors to rust itself labels Jun 4, 2021
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 4, 2021
@jyn514
Copy link
Member Author

jyn514 commented Jun 4, 2021

In particular, this came up in #84942, where I changed the html_root_url for libstd and stumbled around rustdoc for a while thinking the bug was there.

@jyn514 jyn514 force-pushed the library-changes branch from 05c64dd to 3bbd4da Compare June 4, 2021 17:42
@rust-log-analyzer

This comment has been minimized.

…nload-rustc`

Previously, changing the standard library with `download-rustc =
"if-unchanged"` would incorrectly reuse the cached compiler and standard
library from CI, which was confusing and led to incorrect test failures
or successes.
@jyn514 jyn514 force-pushed the library-changes branch from 3bbd4da to 261d16a Compare June 4, 2021 18:03
@Mark-Simulacrum
Copy link
Member

@bors r+

My guess is this may also not be quite enough (e.g., src/version and some other files also play a role in compiler behavior). But identifying the set of files that matter may be tough. Unfortunately it doesn't seem like there's really a great way to isolate that list easily.

@bors
Copy link
Contributor

bors commented Jun 7, 2021

📌 Commit 261d16a 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 Jun 7, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2021
Rollup of 6 pull requests

Successful merges:

 - rust-lang#84262 (Fix ICE during type layout when there's a `[type error]`)
 - rust-lang#85973 (Replace a `match` with an `if let`)
 - rust-lang#85996 (rustbuild: take changes to the standard library into account for `download-rustc`)
 - rust-lang#86016 (Unify duplicate linker_and_flavor methods in rustc_codegen_{cranelift,ssa}.)
 - rust-lang#86025 (Remove the install prefix from the rpath set when using -Crpath)
 - rust-lang#86081 (Use `try_into` instead of asserting manually)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7d07cfb into rust-lang:master Jun 7, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 7, 2021
@jyn514 jyn514 deleted the library-changes branch June 7, 2021 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-contributor-roadblock Area: Makes things more difficult for new contributors to rust itself 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.

6 participants