Skip to content

Commit

Permalink
Auto merge of #11712 - ehuss:ci-macos-nightly, r=weihanglo
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Feb 14, 2023
2 parents fb00cbe + fe8dd1b commit bd8c8e7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ jobs:
os: macos-latest
rust: stable
other: x86_64-apple-ios
- name: macOS x86_64 nightly
os: macos-latest
rust: nightly
other: x86_64-apple-ios
- name: Windows x86_64 MSVC stable
os: windows-latest
rust: stable-msvc
Expand Down
23 changes: 15 additions & 8 deletions tests/testsuite/clean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -403,15 +403,22 @@ fn clean_verbose() {
Package::new("bar", "0.1.0").publish();

p.cargo("build").run();
p.cargo("clean -p bar --verbose")
.with_stderr(
"\
[REMOVING] [..]
[REMOVING] [..]
[REMOVING] [..]
[REMOVING] [..]
let mut expected = String::from(
"\
[REMOVING] [..]target/debug/.fingerprint/bar[..]
[REMOVING] [..]target/debug/deps/libbar[..].rlib
[REMOVING] [..]target/debug/deps/bar-[..].d
[REMOVING] [..]target/debug/deps/libbar[..].rmeta
",
)
);
if cfg!(target_os = "macos") {
// Rust 1.69 has changed so that split-debuginfo=unpacked includes unpacked for rlibs.
for obj in p.glob("target/debug/deps/bar-*.o") {
expected.push_str(&format!("[REMOVING] [..]{}", obj.unwrap().display()));
}
}
p.cargo("clean -p bar --verbose")
.with_stderr_unordered(&expected)
.run();
p.cargo("build").run();
}
Expand Down

0 comments on commit bd8c8e7

Please sign in to comment.