Skip to content

Commit bd8c8e7

Browse files
committed
Auto merge of #11712 - ehuss:ci-macos-nightly, r=weihanglo
Run CI for macOS on nightly This adds coverage for macOS on nightly. Since Cargo is very platform-dependent, I think it would be good to have full coverage on most tier-1 platforms. This includes a small fix for a test that recently started failing on nightly.
2 parents fb00cbe + fe8dd1b commit bd8c8e7

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ jobs:
5656
os: macos-latest
5757
rust: stable
5858
other: x86_64-apple-ios
59+
- name: macOS x86_64 nightly
60+
os: macos-latest
61+
rust: nightly
62+
other: x86_64-apple-ios
5963
- name: Windows x86_64 MSVC stable
6064
os: windows-latest
6165
rust: stable-msvc

tests/testsuite/clean.rs

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -403,15 +403,22 @@ fn clean_verbose() {
403403
Package::new("bar", "0.1.0").publish();
404404

405405
p.cargo("build").run();
406-
p.cargo("clean -p bar --verbose")
407-
.with_stderr(
408-
"\
409-
[REMOVING] [..]
410-
[REMOVING] [..]
411-
[REMOVING] [..]
412-
[REMOVING] [..]
406+
let mut expected = String::from(
407+
"\
408+
[REMOVING] [..]target/debug/.fingerprint/bar[..]
409+
[REMOVING] [..]target/debug/deps/libbar[..].rlib
410+
[REMOVING] [..]target/debug/deps/bar-[..].d
411+
[REMOVING] [..]target/debug/deps/libbar[..].rmeta
413412
",
414-
)
413+
);
414+
if cfg!(target_os = "macos") {
415+
// Rust 1.69 has changed so that split-debuginfo=unpacked includes unpacked for rlibs.
416+
for obj in p.glob("target/debug/deps/bar-*.o") {
417+
expected.push_str(&format!("[REMOVING] [..]{}", obj.unwrap().display()));
418+
}
419+
}
420+
p.cargo("clean -p bar --verbose")
421+
.with_stderr_unordered(&expected)
415422
.run();
416423
p.cargo("build").run();
417424
}

0 commit comments

Comments
 (0)