fix: build universal macOS release assets

Author: OneNoted

.github/workflows/release-assets.yml

@@ -95,6 +95,10 @@ jobs:
 
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: |
+            aarch64-apple-darwin
+            x86_64-apple-darwin
 
       - name: Cache Rust artifacts
         uses: Swatinem/rust-cache@v2
@@ -113,12 +117,15 @@ jobs:
         if: steps.release-gate.outputs.signed_release == 'true'
         run: bash scripts/install_macos_codesign_certificate.sh
 
+      - name: Build universal macOS dependencies
+        run: TASKERS_MACOS_DEP_MODE=universal bash scripts/macos-build-preview-deps.sh
+
       - name: Generate Xcode project
-        run: bash scripts/generate_macos_project.sh
+        run: TASKERS_MACOS_DEP_MODE=universal bash scripts/generate_macos_project.sh
 
       - name: Build universal Taskers.app
         run: |
-          xcodebuild build \
+          TASKERS_SKIP_MACOS_PREBUILD_DEPS=1 xcodebuild build \
             -project macos/Taskers.xcodeproj \
             -scheme TaskersMac \
             -configuration Release \

macos/project.yml

@@ -38,7 +38,9 @@ targets:
     preBuildScripts:
       - name: Build macOS Preview Dependencies
         script: |
-          "${SRCROOT}/../scripts/macos-build-preview-deps.sh"
+          if [ "${TASKERS_SKIP_MACOS_PREBUILD_DEPS:-0}" != "1" ]; then
+            "${SRCROOT}/../scripts/macos-build-preview-deps.sh"
+          fi
         basedOnDependencyAnalysis: false
     postBuildScripts:
       - name: Stage App Bundle Support

scripts/generate_macos_project.sh

@@ -3,10 +3,14 @@ set -euo pipefail
 
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 cd "${ROOT_DIR}"
+BUILD_MODE="${TASKERS_MACOS_DEP_MODE:-native}"
+MODE_STAMP="build/macos/.deps-mode"
 
 if [[ ! -d build/macos/GhosttyKit.xcframework ]] \
   || [[ ! -f build/macos/libtaskers_macos_ffi.a ]] \
-  || [[ ! -x build/macos/bin/taskersctl ]]; then
+  || [[ ! -x build/macos/bin/taskersctl ]] \
+  || [[ ! -f "${MODE_STAMP}" ]] \
+  || [[ "$(<"${MODE_STAMP}")" != "${BUILD_MODE}" ]]; then
   bash scripts/macos-build-preview-deps.sh
 fi
 

scripts/macos-build-preview-deps.sh

@@ -5,16 +5,45 @@ ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 BUILD_DIR="${ROOT_DIR}/build/macos"
 GHOSTTY_DIR="${ROOT_DIR}/vendor/ghostty"
 GHOSTTY_VERSION="$(sed -n 's/^.*\.version = "\([^"]*\)".*$/\1/p' "${GHOSTTY_DIR}/build.zig.zon" | head -n1)"
+BUILD_MODE="${TASKERS_MACOS_DEP_MODE:-native}"
+MODE_STAMP="${BUILD_DIR}/.deps-mode"
+
+case "${BUILD_MODE}" in
+  native|universal)
+    ;;
+  *)
+    echo "unsupported TASKERS_MACOS_DEP_MODE=${BUILD_MODE}; expected native or universal" >&2
+    exit 1
+    ;;
+esac
 
 mkdir -p "${BUILD_DIR}/bin" "${BUILD_DIR}/resources"
 
 pushd "${ROOT_DIR}" >/dev/null
-cargo build --release -p taskers-macos-ffi
-cargo build --release -p taskers-cli --bin taskersctl
+if [[ "${BUILD_MODE}" == "universal" ]]; then
+  cargo build --release -p taskers-macos-ffi --target aarch64-apple-darwin
+  cargo build --release -p taskers-macos-ffi --target x86_64-apple-darwin
+  cargo build --release -p taskers-cli --bin taskersctl --target aarch64-apple-darwin
+  cargo build --release -p taskers-cli --bin taskersctl --target x86_64-apple-darwin
+else
+  cargo build --release -p taskers-macos-ffi
+  cargo build --release -p taskers-cli --bin taskersctl
+fi
 popd >/dev/null
 
-cp "${ROOT_DIR}/target/release/libtaskers_macos_ffi.a" "${BUILD_DIR}/libtaskers_macos_ffi.a"
-cp "${ROOT_DIR}/target/release/taskersctl" "${BUILD_DIR}/bin/taskersctl"
+if [[ "${BUILD_MODE}" == "universal" ]]; then
+  lipo -create \
+    -output "${BUILD_DIR}/libtaskers_macos_ffi.a" \
+    "${ROOT_DIR}/target/aarch64-apple-darwin/release/libtaskers_macos_ffi.a" \
+    "${ROOT_DIR}/target/x86_64-apple-darwin/release/libtaskers_macos_ffi.a"
+  lipo -create \
+    -output "${BUILD_DIR}/bin/taskersctl" \
+    "${ROOT_DIR}/target/aarch64-apple-darwin/release/taskersctl" \
+    "${ROOT_DIR}/target/x86_64-apple-darwin/release/taskersctl"
+else
+  cp "${ROOT_DIR}/target/release/libtaskers_macos_ffi.a" "${BUILD_DIR}/libtaskers_macos_ffi.a"
+  cp "${ROOT_DIR}/target/release/taskersctl" "${BUILD_DIR}/bin/taskersctl"
+fi
 chmod +x "${BUILD_DIR}/bin/taskersctl"
 
 pushd "${GHOSTTY_DIR}" >/dev/null
@@ -25,7 +54,7 @@ zig build \
   -Demit-xcframework=true \
   -Demit-macos-app=false \
   "-Dversion-string=${GHOSTTY_VERSION}" \
-  -Dxcframework-target=native
+  "-Dxcframework-target=${BUILD_MODE}"
 popd >/dev/null
 
 rm -rf "${BUILD_DIR}/GhosttyKit.xcframework"
@@ -34,3 +63,5 @@ cp -R "${GHOSTTY_DIR}/macos/GhosttyKit.xcframework" "${BUILD_DIR}/GhosttyKit.xcf
 rm -rf "${BUILD_DIR}/resources/ghostty" "${BUILD_DIR}/resources/terminfo"
 cp -R "${GHOSTTY_DIR}/zig-out/share/ghostty" "${BUILD_DIR}/resources/ghostty"
 cp -R "${GHOSTTY_DIR}/zig-out/share/terminfo" "${BUILD_DIR}/resources/terminfo"
+
+printf '%s\n' "${BUILD_MODE}" > "${MODE_STAMP}"