Auto merge of #11712 - ehuss:ci-macos-nightly, r=weihanglo

bors · bors · commit bd8c8e789ad6 · 2023-02-14T21:53:52.000Z
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.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -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
diff --git a/tests/testsuite/clean.rs b/tests/testsuite/clean.rs
@@ -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();
 }
