Merge pull request #7576 from drinkcat/ci-macos

Test workspace CI on macos

.github/workflows/CICD.yml

@@ -520,8 +520,8 @@ jobs:
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: "feat_os_unix,uudoc"   , use-cross: no, workspace-tests: true }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-musl   , features: feat_os_unix_musl      , use-cross: use-cross }
           - { os: ubuntu-latest  , target: x86_64-unknown-redox        , features: feat_os_unix_redox     , use-cross: redoxer , skip-tests: true }
-          - { os: macos-latest   , target: aarch64-apple-darwin        , features: feat_os_macos } # M1 CPU
-          - { os: macos-13       , target: x86_64-apple-darwin         , features: feat_os_macos }
+          - { os: macos-latest   , target: aarch64-apple-darwin        , features: feat_os_macos, workspace-tests: true } # M1 CPU
+          - { os: macos-13       , target: x86_64-apple-darwin         , features: feat_os_macos, workspace-tests: true }
           - { os: windows-latest , target: i686-pc-windows-msvc        , features: feat_os_windows }
           - { os: windows-latest , target: x86_64-pc-windows-gnu       , features: feat_os_windows }
           - { os: windows-latest , target: x86_64-pc-windows-msvc      , features: feat_os_windows }

Cargo.toml

@@ -292,8 +292,7 @@ file_diff = "1.0.0"
 filetime = "0.2.23"
 fnv = "1.0.7"
 fs_extra = "1.3.0"
-# Remove the "=" once we moved to Rust edition 2024
-fts-sys = "=0.2.16"
+fts-sys = "0.2.16"
 fundu = "2.0.0"
 gcd = "2.3"
 glob = "0.3.1"

src/uu/chcon/src/chcon.rs

@@ -3,6 +3,7 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 // spell-checker:ignore (vars) RFILE
+#![cfg(target_os = "linux")]
 #![allow(clippy::upper_case_acronyms)]
 
 use clap::builder::ValueParser;

src/uu/chcon/src/errors.rs

@@ -2,6 +2,8 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
+#![cfg(target_os = "linux")]
+
 use std::ffi::OsString;
 use std::fmt::Write;
 use std::io;

src/uu/chcon/src/fts.rs

@@ -2,6 +2,8 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
+#![cfg(target_os = "linux")]
+
 use std::ffi::{CStr, CString, OsStr};
 use std::marker::PhantomData;
 use std::os::raw::{c_int, c_long, c_short};

src/uu/chcon/src/main.rs

@@ -1 +1,2 @@
+#![cfg(target_os = "linux")]
 uucore::bin!(uu_chcon);

src/uu/runcon/src/errors.rs

@@ -2,6 +2,8 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
+#![cfg(target_os = "linux")]
+
 use std::ffi::OsString;
 use std::fmt::{Display, Formatter, Write};
 use std::io;

src/uu/runcon/src/main.rs

@@ -1 +1,2 @@
+#![cfg(target_os = "linux")]
 uucore::bin!(uu_runcon);

src/uu/runcon/src/runcon.rs

@@ -3,6 +3,7 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 // spell-checker:ignore (vars) RFILE
+#![cfg(target_os = "linux")]
 
 use clap::builder::ValueParser;
 use uucore::error::{UClapError, UError, UResult};