From d9e61998356f9eeca77f3cf17e3164f044199172 Mon Sep 17 00:00:00 2001 From: Charles L Date: Mon, 1 Sep 2025 14:02:31 +1000 Subject: [PATCH 1/2] fix: mise build failing --- mise.toml | 2 +- scripts/download-bin.mjs | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mise.toml b/mise.toml index e44555be4..9b353a0a6 100644 --- a/mise.toml +++ b/mise.toml @@ -84,7 +84,7 @@ run = [ description = "Build complete application (matches Makefile)" depends = ["install-and-build"] run = [ - "yarn copy:lib", + "yarn download:bin", "yarn build" ] diff --git a/scripts/download-bin.mjs b/scripts/download-bin.mjs index 44693ab79..a1884d940 100644 --- a/scripts/download-bin.mjs +++ b/scripts/download-bin.mjs @@ -136,6 +136,11 @@ async function main() { console.log("Error Found:", err); } }) + copyFile(path.join(binDir, 'bun'), path.join(binDir, 'bun-universal-apple-darwin'), (err) => { + if (err) { + console.log("Error Found:", err); + } + }) } else if (platform === 'linux') { copyFile(path.join(binDir, 'bun'), path.join(binDir, 'bun-x86_64-unknown-linux-gnu'), (err) => { if (err) { @@ -191,6 +196,11 @@ async function main() { console.log("Error Found:", err); } }) + copyFile(path.join(binDir, 'uv'), path.join(binDir, 'uv-universal-apple-darwin'), (err) => { + if (err) { + console.log("Error Found:", err); + } + }) } else if (platform === 'linux') { copyFile(path.join(binDir, 'uv'), path.join(binDir, 'uv-x86_64-unknown-linux-gnu'), (err) => { if (err) { From 17ccc9dca93da867273b58a057c9b7a99c57fbf2 Mon Sep 17 00:00:00 2001 From: Charles L Date: Tue, 2 Sep 2025 14:49:02 +1000 Subject: [PATCH 2/2] feat: install rustup requirements for MacOS universal builds --- mise.toml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mise.toml b/mise.toml index 9b353a0a6..3c7c5febd 100644 --- a/mise.toml +++ b/mise.toml @@ -80,9 +80,22 @@ run = [ # BUILD TASKS # ============================================================================ +[tasks.install-rust-targets] +description = "Install required Rust targets for MacOS universal builds" +run = ''' +#!/usr/bin/env bash +# Check if we're on macOS +if [[ "$OSTYPE" == "darwin"* ]]; then + echo "Detected macOS, installing universal build targets..." + rustup target add x86_64-apple-darwin + rustup target add aarch64-apple-darwin + echo "Rust targets installed successfully!" +fi +''' + [tasks.build] description = "Build complete application (matches Makefile)" -depends = ["install-and-build"] +depends = ["install-rust-targets", "install-and-build"] run = [ "yarn download:bin", "yarn build"