-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
appveyor: Use Ninja/sccache on MSVC #41447
Conversation
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
Note that after this we'll finally be using sccache on 100% of our platforms, yay for consistent caching solutions! |
src/bootstrap/native.rs
Outdated
build.config.ccache.is_some() { | ||
let mut cc = env::current_exe().unwrap(); | ||
cc.pop(); | ||
cc.push("sccache-plus-cl.exe"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use PathBuf::set_file_name
instead.
src/bootstrap/native.rs
Outdated
if target.contains("msvc") && | ||
build.config.ninja && | ||
build.config.ccache.is_some() { | ||
let mut cc = env::current_exe().unwrap(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use expect
with at least somewhat greppable string.
src/bootstrap/bin/sccache-plus-cl.rs
Outdated
let compiler = cfg.get_compiler(); | ||
|
||
// Invoke sccache with said compiler | ||
let mut cmd = Command::new("sccache"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doesn’t this ignore the path to sccache
that can be specified in the config.toml?
Didn’t look at changes to yaml/Dockerfiles. Commented for the rest. |
c797287
to
d75528e
Compare
@bors r+ |
📌 Commit d75528e has been approved by |
…brson appveyor: Use Ninja/sccache on MSVC Now that the final bug fixes have been merged into sccache we can start leveraging sccache on the MSVC builders on AppVeyor instead of relying on the ad-hoc caching strategy of trigger files and whatnot.
…brson appveyor: Use Ninja/sccache on MSVC Now that the final bug fixes have been merged into sccache we can start leveraging sccache on the MSVC builders on AppVeyor instead of relying on the ad-hoc caching strategy of trigger files and whatnot.
d75528e
to
970e2a9
Compare
@bors: r=brson |
📌 Commit 970e2a9 has been approved by |
⌛ Testing commit 970e2a9 with merge 3fa950c... |
💔 Test failed - status-appveyor |
@bors retry Appveyor network issues https://appveyor.statuspage.io/incidents/06gzq846jl9x |
⌛ Testing commit 970e2a9 with merge 0f9d66f... |
💔 Test failed - status-appveyor |
Legitimate failure, I think:
|
This build is no longer a forked version with temporary bugfixes, everything should be upstreamed!
Now that the final bug fixes have been merged into sccache we can start leveraging sccache on the MSVC builders on AppVeyor instead of relying on the ad-hoc caching strategy of trigger files and whatnot.
970e2a9
to
2e72bcb
Compare
@bors: r=brson |
📌 Commit 2e72bcb has been approved by |
…brson appveyor: Use Ninja/sccache on MSVC Now that the final bug fixes have been merged into sccache we can start leveraging sccache on the MSVC builders on AppVeyor instead of relying on the ad-hoc caching strategy of trigger files and whatnot.
appveyor: Use Ninja/sccache on MSVC Now that the final bug fixes have been merged into sccache we can start leveraging sccache on the MSVC builders on AppVeyor instead of relying on the ad-hoc caching strategy of trigger files and whatnot.
☀️ Test successful - status-appveyor, status-travis |
Pulls in mozilla/sccache@ef0d77543 to fix rust-lang#40240 again after the builds included in rust-lang#41447 forgot to include the mio fixed included in rust-lang#41076. Closes rust-lang#40240
ci: Update sccache build Pulls in mozilla/sccache@ef0d77543 to fix #40240 again after the builds included in #41447 forgot to include the mio fixed included in #41076. Closes #40240
Now that the final bug fixes have been merged into sccache we can start
leveraging sccache on the MSVC builders on AppVeyor instead of relying on the
ad-hoc caching strategy of trigger files and whatnot.