Build for M1 on CI (software-mansion#189)

nickdichev-firework · Oct 3, 2023 · 9e321f9 · 9e321f9
1 parent ce7f957
commit 9e321f9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/.github/workflows/package_for_release.yml b/.github/workflows/package_for_release.yml
@@ -25,7 +25,7 @@ jobs:
                 name: video_compositor_linux_x86_64.tar.gz
                 path: video_compositor_linux_x86_64.tar.gz
 
-    macos:
+    macos_x86_64:
         runs-on: macos-latest
         steps:
             - name: 🛠 Install system dependencies
@@ -44,3 +44,23 @@ jobs:
               with:
                 name: video_compositor_darwin_x86_64.tar.gz
                 path: video_compositor_darwin_x86_64.tar.gz
+
+    macos-aarch64:
+        runs-on: macos-latest-xlarge
+        steps:
+            - name: 🛠 Install system dependencies
+              run: brew install ffmpeg
+
+            - name: 🔧 Install the rust toolchain
+              uses: dtolnay/rust-toolchain@stable
+
+            - name: 📥 Checkout repo
+              uses: actions/checkout@v3
+
+            - name: 📦 Package
+              run: cargo run --bin package_for_release
+
+            - uses: actions/upload-artifact@v3
+              with:
+                name: video_compositor_darwin_aarch64.tar.gz
+                path: video_compositor_darwin_aarch64.tar.gz
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -24,8 +24,10 @@ cd "$ROOT_DIR/release_tmp"
 
 gh run download "$WORKFLOW_RUN_ID" -n video_compositor_linux_x86_64.tar.gz
 gh run download "$WORKFLOW_RUN_ID" -n video_compositor_darwin_x86_64.tar.gz
+gh run download "$WORKFLOW_RUN_ID" -n video_compositor_darwin_aarch64.tar.gz
 gh release create "$RELEASE_TAG"
 gh release upload "$RELEASE_TAG" video_compositor_linux_x86_64.tar.gz
 gh release upload "$RELEASE_TAG" video_compositor_darwin_x86_64.tar.gz
+gh release upload "$RELEASE_TAG" video_compositor_darwin_aarch64.tar.gz
 
 rm -rf "$ROOT_DIR/release_tmp"
diff --git a/src/bin/package_for_release/bundle_macos.rs b/src/bin/package_for_release/bundle_macos.rs
@@ -19,24 +19,6 @@ pub fn bundle_macos_app() -> Result<()> {
         bundle_app(INTEL_MAC_TARGET, INTEL_OUTPUT_FILE)?;
     } else if cfg!(target_arch = "aarch64") {
         bundle_app(ARM_MAC_TARGET, ARM_OUTPUT_FILE)?;
-        // We do not have CI with M1 yet, so this will be built locally for now.
-        let release_tag = env::var("RELEASE_TAG")?;
-        let root_dir_str = env!("CARGO_MANIFEST_DIR");
-        let root_dir: PathBuf = root_dir_str.into();
-        let upload_path = root_dir.join(ARM_OUTPUT_FILE);
-        let exit_code = Command::new("gh")
-            .args([
-                "release",
-                "upload",
-                &release_tag,
-                &upload_path.display().to_string(),
-            ])
-            .spawn()?
-            .wait()?
-            .code();
-        if exit_code != Some(0) {
-            return Err(anyhow!("Command gh failed with exit code {:?}", exit_code));
-        }
     } else {
         panic!("Unknown architecture")
     }