feat: add aarch64-apple-darwin platform

maidsafe · Aug 2, 2024 · bd93e58 · bd93e58
1 parent 0a6084a
commit bd93e58
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -93,6 +93,7 @@ pub enum Platform {
     LinuxMuslArm,
     LinuxMuslArmV7,
     MacOs,
+    MacOsAarch64,
     Windows,
 }
 
@@ -104,6 +105,7 @@ impl fmt::Display for Platform {
             Platform::LinuxMuslArm => write!(f, "arm-unknown-linux-musleabi"),
             Platform::LinuxMuslArmV7 => write!(f, "armv7-unknown-linux-musleabihf"),
             Platform::MacOs => write!(f, "x86_64-apple-darwin"),
+            Platform::MacOsAarch64 => write!(f, "aarch64-apple-darwin"),
             Platform::Windows => write!(f, "x86_64-pc-windows-msvc"), // This appears to be the same as the above, so I'm using the same string.
         }
     }
@@ -427,7 +429,13 @@ pub fn get_running_platform() -> Result<Platform> {
             }
             Ok(Platform::Windows)
         }
-        "macos" => Ok(Platform::MacOs),
+        "macos" => match ARCH {
+            "x86_64" => Ok(Platform::MacOs),
+            "aarch64" => Ok(Platform::MacOsAarch64),
+            &_ => Err(Error::PlatformNotSupported(format!(
+                "We currently do not have binaries for the {OS}/{ARCH} combination"
+            ))),
+        },
         &_ => Err(Error::PlatformNotSupported(format!(
             "{OS} is not currently supported"
         ))),

diff --git a/tests/test_download_from_s3.rs b/tests/test_download_from_s3.rs
@@ -14,7 +14,7 @@ use sn_releases::{ArchiveType, Platform, ReleaseType, SafeReleaseRepoActions};
 const FAUCET_VERSION: &str = "0.1.98";
 const NAT_DETECTION_VERSION: &str = "0.1.0";
 const NODE_LAUNCHPAD_VERSION: &str = "0.1.0";
-const SAFE_VERSION: &str = "0.83.51";
+const SAFE_VERSION: &str = "0.94.0";
 const SAFENODE_VERSION: &str = "0.93.7";
 const SAFENODE_MANAGER_VERSION: &str = "0.1.8";
 const SAFENODE_MANAGERD_VERSION: &str = "0.4.1";
@@ -132,6 +132,17 @@ async fn should_download_and_extract_safe_for_macos() {
     .await;
 }
 
+#[tokio::test]
+async fn should_download_and_extract_safe_for_macos_aarch64() {
+    download_and_extract(
+        &ReleaseType::Safe,
+        SAFE_VERSION,
+        &Platform::MacOsAarch64,
+        &ArchiveType::TarGz,
+    )
+        .await;
+}
+
 #[tokio::test]
 async fn should_download_and_extract_safe_for_windows() {
     download_and_extract(