feat(build): support building on macos

Signed-off-by: Reuben Miller <reuben.d.miller@gmail.com>

Author: reubenmiller

ci/build_scripts/build.sh

@@ -32,18 +32,22 @@ Args:
 
     Example ARCH (target) values:
 
-        MUSL variants
+        Linux MUSL variants
         * x86_64-unknown-linux-musl
         * aarch64-unknown-linux-musl
         * armv7-unknown-linux-musleabihf
         * arm-unknown-linux-musleabihf
 
-        GNU variants
+        Linux GNU variants
         * x86_64-unknown-linux-gnu
         * aarch64-unknown-linux-gnu
         * armv7-unknown-linux-gnueabihf
         * arm-unknown-linux-gnueabihf
 
+        Apple
+        * aarch64-apple-darwin
+        * x86_64-apple-darwin
+
 Flags:
     --help|-h   Show this help
     --skip-build    Skip building the binaries and only package them (e.g. just create the linux packages)

ci/build_scripts/package.sh

@@ -68,7 +68,7 @@ VERSION=
 CLEAN=1
 PACKAGES=()
 COMMAND=
-PACKAGE_TYPES="deb,apk,rpm,tarball"
+PACKAGE_TYPES=
 
 while [ $# -gt 0 ]
 do
@@ -117,6 +117,14 @@ if [ -z "$TARGET" ]; then
     TARGET=$(./ci/build_scripts/detect_target.sh)
 fi
 
+if [ -z "$PACKAGE_TYPES" ]; then
+    case "$TARGET" in
+        *linux*) PACKAGE_TYPES="deb,apk,rpm,tarball" ;;
+        *apple*) PACKAGE_TYPES="tarball" ;;
+        *) PACKAGE_TYPES="tarball" ;;
+    esac
+fi
+
 # Normalize output dir
 OUTPUT_DIR="${OUTPUT_DIR%/}"
 
@@ -204,6 +212,8 @@ get_package_arch() {
         riscv64gc-unknown-linux-*) pkg_arch=riscv64 ;;
         mips64el-unknown-linux-*abi64) pkg_arch=mips64le ;;
         mipsel-unknown-linux-*) pkg_arch=mipsle ;;
+        aarch64-apple-darwin) pkg_arch=arm64 ;;
+        x86_64-apple-darwin) pkg_arch=amd64 ;;
         *)
             echo "Unknown package architecture. value=$1"
             exit 1

ci/build_scripts/publish_packages.sh

@@ -183,6 +183,12 @@ get_user_friendly_arch() {
         *arm-unknown-linux-musleabihf*)
             easy_arch=armv6
             ;;
+        *aarch64-apple-darwin*)
+            easy_arch=macos-arm64
+            ;;
+        *x86_64-apple-darwin*)
+            easy_arch=macos-amd64
+            ;;
     esac
     echo "$easy_arch"
 }

crates/common/logged_command/src/logged_command.rs

@@ -317,6 +317,7 @@ EOF
 
         // On expect the errors to be logged
         let log_content = String::from_utf8(std::fs::read(log_file_path)?)?;
+        #[cfg(target_os = "linux")]
         assert_eq!(
             log_content,
             r#"----- $ ls "dummy-file"
@@ -328,6 +329,20 @@ EOF
 stderr <<EOF
 ls: cannot access 'dummy-file': No such file or directory
 EOF
+"#
+        );
+        #[cfg(target_os = "macos")]
+        assert_eq!(
+            log_content,
+            r#"----- $ ls "dummy-file"
+exit status: 1
+
+stdout <<EOF
+EOF
+
+stderr <<EOF
+ls: dummy-file: No such file or directory
+EOF
 "#
         );
         Ok(())

crates/common/tedge_utils/src/file.rs

@@ -636,13 +636,22 @@ mod tests {
         assert!(err.to_string().contains("User not found"));
     }
 
+    #[cfg(target_os = "linux")]
     #[test]
     fn get_gid_of_groups() {
         assert_eq!(get_gid_by_name("root").unwrap(), 0);
         let err = get_gid_by_name("nonexistent_group").unwrap_err();
         assert!(err.to_string().contains("Group not found"));
     }
 
+    #[cfg(target_os = "macos")]
+    #[test]
+    fn get_gid_of_groups() {
+        assert_ne!(get_gid_by_name("staff").unwrap(), 0);
+        let err = get_gid_by_name("nonexistent_group").unwrap_err();
+        assert!(err.to_string().contains("Group not found"));
+    }
+
     #[tokio::test]
     async fn move_file_to_different_filesystem() {
         let file_dir = TempDir::new().unwrap();

crates/common/tedge_utils/src/notify.rs

@@ -222,6 +222,7 @@ mod tests {
         }
     }
 
+    #[cfg_attr(target_os = "macos", ignore)]
     #[tokio::test]
     async fn test_multiple_known_files_watched() {
         let ttd = Arc::new(TempTedgeDir::new());
@@ -247,6 +248,7 @@ mod tests {
         file_handler.await.unwrap();
     }
 
+    #[cfg_attr(target_os = "macos", ignore)]
     #[tokio::test]
     async fn it_works() {
         let ttd = Arc::new(TempTedgeDir::new());
@@ -280,6 +282,7 @@ mod tests {
             .unwrap();
     }
 
+    #[cfg_attr(target_os = "macos", ignore)]
     #[tokio::test]
     async fn test_multiple_unknown_files_watched() {
         let ttd = Arc::new(TempTedgeDir::new());
@@ -308,6 +311,7 @@ mod tests {
         file_handler.await.unwrap();
     }
 
+    #[cfg_attr(target_os = "macos", ignore)]
     #[tokio::test]
     async fn test_multiple_directories_watched() {
         let ttd_a = Arc::new(TempTedgeDir::new());
@@ -352,6 +356,7 @@ mod tests {
     /// operation may result in other events, like `Rename`, `Delete`, etc. We want these operations to emit `Modify` as
     /// well, so that the consumers can only subscribe to single type of event and properly respond every time a file
     /// they're watching changes.
+    #[cfg_attr(target_os = "macos", ignore)]
     #[tokio::test]
     async fn modify_emitted_for_move_copy_create_delete() {
         // Arrange

crates/extensions/tedge_file_system_ext/src/lib.rs

@@ -196,6 +196,7 @@ mod tests {
         ttd.file("file_a");
         ttd.dir("dir_b").file("file_b");
 
+        #[cfg(target_os = "linux")]
         client_box
             .with_timeout(TEST_TIMEOUT)
             .assert_received_unordered([
@@ -205,6 +206,16 @@ mod tests {
             ])
             .await;
 
+        #[cfg(target_os = "macos")]
+        client_box
+            .with_timeout(TEST_TIMEOUT)
+            .assert_received_unordered([
+                FsWatchEvent::FileCreated(ttd_full.to_path_buf().join("file_a")),
+                FsWatchEvent::DirectoryCreated(ttd_full.to_path_buf().join("dir_b")),
+                FsWatchEvent::FileCreated(ttd_full.to_path_buf().join("dir_b").join("file_b")),
+            ])
+            .await;
+
         Ok(())
     }
 }