fix up build on macos

.github/workflows/smoke.yml

@@ -126,6 +126,30 @@ jobs:
           target/release/nydus-image
           target/release/nydusd
 
+  nydusd-build-macos:
+    runs-on: macos-11
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Cache cargo
+      uses: Swatinem/rust-cache@v2.2.0
+      with:
+        cache-on-failure: true
+        key: ${{ runner.os }}-cargo-${{ matrix.arch }}
+    - name: build
+      run: |
+        if [[ "${{matrix.arch}}" == "amd64" ]]; then
+          RUST_TARGET="x86_64-apple-darwin"
+        else
+          RUST_TARGET="aarch64-apple-darwin"
+        fi
+        cargo install --version 0.2.4 cross
+        rustup target add ${RUST_TARGET}
+        rustup component add rustfmt clippy
+        make -e RUST_TARGET_STATIC=$RUST_TARGET -e CARGO=cross static-release
+
   nydus-integration-test:
     runs-on: ubuntu-latest
     needs: [contrib-build, nydus-build]

builder/src/core/overlay.rs

@@ -255,7 +255,7 @@ mod tests {
     #[test]
     fn test_node() {
         let mut inode = InodeWrapper::V5(RafsV5Inode::default());
-        inode.set_mode(libc::S_IFCHR);
+        inode.set_mode(libc::S_IFCHR as u32);
         let node = Node::new(inode, NodeInfo::default(), 0);
         assert!(!node.is_overlayfs_whiteout(WhiteoutSpec::None));
         assert!(node.is_overlayfs_whiteout(WhiteoutSpec::Overlayfs));
@@ -270,7 +270,7 @@ mod tests {
             .xattrs
             .add(OVERLAYFS_WHITEOUT_OPAQUE.into(), "y".into())
             .is_ok());
-        inode.set_mode(libc::S_IFDIR);
+        inode.set_mode(libc::S_IFDIR as u32);
         let node = Node::new(inode, info, 0);
         assert!(!node.is_overlayfs_opaque(WhiteoutSpec::None));
         assert!(node.is_overlayfs_opaque(WhiteoutSpec::Overlayfs));
@@ -285,7 +285,7 @@ mod tests {
             .xattrs
             .add(OVERLAYFS_WHITEOUT_OPAQUE.into(), "n".into())
             .is_ok());
-        inode.set_mode(libc::S_IFDIR);
+        inode.set_mode(libc::S_IFDIR as u32);
         let node = Node::new(inode, info, 0);
         assert!(!node.is_overlayfs_opaque(WhiteoutSpec::None));
         assert!(!node.is_overlayfs_opaque(WhiteoutSpec::Overlayfs));
@@ -296,7 +296,7 @@ mod tests {
             .xattrs
             .add(OVERLAYFS_WHITEOUT_OPAQUE.into(), "y".into())
             .is_ok());
-        inode.set_mode(libc::S_IFCHR);
+        inode.set_mode(libc::S_IFCHR as u32);
         let node = Node::new(inode, info, 0);
         assert!(!node.is_overlayfs_opaque(WhiteoutSpec::None));
         assert!(!node.is_overlayfs_opaque(WhiteoutSpec::Overlayfs));
@@ -307,7 +307,7 @@ mod tests {
             .xattrs
             .add(OVERLAYFS_WHITEOUT_OPAQUE.into(), "n".into())
             .is_ok());
-        inode.set_mode(libc::S_IFDIR);
+        inode.set_mode(libc::S_IFDIR as u32);
         let node = Node::new(inode, info, 0);
         assert!(!node.is_overlayfs_opaque(WhiteoutSpec::None));
         assert!(!node.is_overlayfs_opaque(WhiteoutSpec::Overlayfs));

rafs/src/metadata/layout/v6.rs

@@ -2636,31 +2636,31 @@ mod tests {
         assert_eq!(dir.e_nameoff, 2048);
 
         assert_eq!(
-            RafsV6Dirent::file_type(libc::S_IFREG),
+            RafsV6Dirent::file_type(libc::S_IFREG as u32),
             EROFS_FILE_TYPE::EROFS_FT_REG_FILE as u8
         );
         assert_eq!(
-            RafsV6Dirent::file_type(libc::S_IFDIR),
+            RafsV6Dirent::file_type(libc::S_IFDIR as u32),
             EROFS_FILE_TYPE::EROFS_FT_DIR as u8
         );
         assert_eq!(
-            RafsV6Dirent::file_type(libc::S_IFCHR),
+            RafsV6Dirent::file_type(libc::S_IFCHR as u32),
             EROFS_FILE_TYPE::EROFS_FT_CHRDEV as u8
         );
         assert_eq!(
-            RafsV6Dirent::file_type(libc::S_IFBLK),
+            RafsV6Dirent::file_type(libc::S_IFBLK as u32),
             EROFS_FILE_TYPE::EROFS_FT_BLKDEV as u8
         );
         assert_eq!(
-            RafsV6Dirent::file_type(libc::S_IFIFO),
+            RafsV6Dirent::file_type(libc::S_IFIFO as u32),
             EROFS_FILE_TYPE::EROFS_FT_FIFO as u8
         );
         assert_eq!(
-            RafsV6Dirent::file_type(libc::S_IFSOCK),
+            RafsV6Dirent::file_type(libc::S_IFSOCK as u32),
             EROFS_FILE_TYPE::EROFS_FT_SOCK as u8
         );
         assert_eq!(
-            RafsV6Dirent::file_type(libc::S_IFLNK),
+            RafsV6Dirent::file_type(libc::S_IFLNK as u32),
             EROFS_FILE_TYPE::EROFS_FT_SYMLINK as u8
         );
     }

rafs/src/mock/mock_inode.rs

@@ -329,7 +329,7 @@ mod tests {
 
         let mut node = MockInode::mock(13, size, chunks);
         node.i_flags = RafsInodeFlags::XATTR;
-        node.i_mode = libc::S_IFDIR;
+        node.i_mode = libc::S_IFDIR as u32;
         node.i_name = "foo".into();
         node.i_digest = digest;
         node.i_parent = RAFS_V5_ROOT_INODE;

service/src/singleton.rs

@@ -284,7 +284,7 @@ pub fn create_daemon(
     Ok(daemon)
 }
 
-#[cfg(test)]
+#[cfg(all(test, target_os = "linux"))]
 mod tests {
     use crate::blob_cache::generate_blob_key;
 
@@ -317,13 +317,11 @@ mod tests {
             waker: Arc::new(waker),
             blob_cache_mgr: Arc::new(BlobCacheMgr::new()),
             fscache_enabled: AtomicBool::new(false),
-            #[cfg(target_os = "linux")]
             fscache: Mutex::new(None),
         }
     }
 
     #[test]
-    #[cfg(target_os = "linux")]
     fn test_initialize_fscache_service() {
         let service_controller = create_service_controller();
 

utils/src/compact.rs

@@ -39,13 +39,12 @@ pub fn minor_dev(dev: u64) -> u64 {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, target_os = "linux"))]
 mod tests {
 
     use super::*;
 
     #[test]
-    #[cfg(target_os = "linux")]
     fn test_dev() {
         let major: u64 = 0xffff_ffff_ffff_abcd;
         let minor: u64 = 0xffff_ffff_abcd_ffff;