Skip to content

Commit e82878c

Browse files
authored
allow windows reserved names in CI (#15135)
<!-- Thanks for submitting a pull request 🎉! Here are some tips for you: * If this is your first contribution, read "Cargo Contribution Guide" first: https://doc.crates.io/contrib/ * Run `cargo fmt --all` to format your code changes. * Small commits and pull requests are always preferable and easy to review. * If your idea is large and needs feedback from the community, read how: https://doc.crates.io/contrib/process/#working-on-large-features * Cargo takes care of compatibility. Read our design principles: https://doc.crates.io/contrib/design.html * When changing help text of cargo commands, follow the steps to generate docs: https://github.com/rust-lang/cargo/tree/master/src/doc#building-the-man-pages * If your PR is not finished, set it as "draft" PR or add "WIP" in its title. * It's ok to use the CI resources to test your PR, but please don't abuse them. ### What does this PR try to resolve? Explain the motivation behind this change. A clear overview along with an in-depth explanation are helpful. You can use `Fixes #<issue number>` to associate this PR to an existing issue. ### How should we test and review this PR? Demonstrate how you test this change and guide reviewers through your PR. With a smooth review process, a pull request usually gets reviewed quicker. If you don't know how to write and run your tests, please read the guide: https://doc.crates.io/contrib/tests ### Additional information Other information you want to mention in this PR, such as prior arts, future extensions, an unresolved problem, or a TODO list. --> We are progressively moving the windows CI from windows 2022 to windows 2025 because we found windows 2025 more stable. In rust-lang/rust#136478 a cargo test failed and this might solve the issue. See [this](rust-lang/rust#136478 (comment)) comment. What do you think? If you have a better way of solving this, let me know 👍
2 parents fefd9fb + 54f97e2 commit e82878c

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

crates/cargo-test-support/src/paths.rs

-5
Original file line numberDiff line numberDiff line change
@@ -373,11 +373,6 @@ pub fn sysroot() -> String {
373373
pub fn windows_reserved_names_are_allowed() -> bool {
374374
use cargo_util::is_ci;
375375

376-
// Ensure tests still run in CI until we need to migrate.
377-
if is_ci() {
378-
return false;
379-
}
380-
381376
use std::ffi::OsStr;
382377
use std::os::windows::ffi::OsStrExt;
383378
use std::ptr;

0 commit comments

Comments
 (0)