From a6b7a97b5829a03dd667466e6dad616e4aa29e37 Mon Sep 17 00:00:00 2001
From: snowdamiz <yurlovandrew@gmail.com>
Date: Fri, 29 May 2026 14:09:35 -0700
Subject: [PATCH] Add macOS Intel release builds

---
 .github/workflows/macos-signed-build.yml    |  5 ++++-
 .github/workflows/release.yml               | 17 +++++++++++++----
 client/package.json                         |  2 +-
 client/src-tauri/Cargo.lock                 |  4 ++--
 client/src-tauri/Cargo.toml                 |  2 +-
 client/src-tauri/crates/xero-cli/Cargo.toml |  2 +-
 client/src-tauri/tauri.conf.json            |  2 +-
 7 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/macos-signed-build.yml b/.github/workflows/macos-signed-build.yml
index 4a4e64a9..2f2f9c3a 100644
--- a/.github/workflows/macos-signed-build.yml
+++ b/.github/workflows/macos-signed-build.yml
@@ -23,6 +23,9 @@ jobs:
           - platform: macos-15
             target: aarch64-apple-darwin
             artifact_suffix: macos-aarch64
+          - platform: macos-15-intel
+            target: x86_64-apple-darwin
+            artifact_suffix: macos-x86_64
 
     runs-on: ${{ matrix.platform }}
     steps:
@@ -47,7 +50,7 @@ jobs:
       - name: Set up Rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: aarch64-apple-darwin
+          targets: ${{ matrix.target }}
 
       - name: Rust cache
         uses: swatinem/rust-cache@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fcaafeb3..32681f15 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -202,6 +202,9 @@ jobs:
           - platform: macos-15
             target: aarch64-apple-darwin
             artifact_suffix: macos-aarch64
+          - platform: macos-15-intel
+            target: x86_64-apple-darwin
+            artifact_suffix: macos-x86_64
           - platform: ubuntu-24.04
             target: x86_64-unknown-linux-gnu
             artifact_suffix: linux-x86_64
@@ -230,7 +233,7 @@ jobs:
             patchelf
 
       - name: Set up protoc (macOS)
-        if: matrix.artifact_suffix == 'macos-aarch64'
+        if: contains(matrix.target, 'apple-darwin')
         run: brew install protobuf
 
       - name: Set up protoc (Windows)
@@ -427,9 +430,15 @@ jobs:
       matrix:
         include:
           - platform: macos-15
+            target: aarch64-apple-darwin
             args: --target aarch64-apple-darwin --config src-tauri/tauri.macos.conf.json -- --bin xero-desktop
             artifact_suffix: macos-aarch64
             platform_key: darwin-aarch64
+          - platform: macos-15-intel
+            target: x86_64-apple-darwin
+            args: --target x86_64-apple-darwin --config src-tauri/tauri.macos.conf.json -- --bin xero-desktop
+            artifact_suffix: macos-x86_64
+            platform_key: darwin-x86_64
           - platform: windows-2025-vs2026
             args: --bundles nsis -- --bin xero-desktop
             artifact_suffix: windows-x86_64
@@ -489,7 +498,7 @@ jobs:
         if: contains(matrix.platform_key, 'darwin')
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: aarch64-apple-darwin
+          targets: ${{ matrix.target }}
 
       - name: Set up Rust
         if: ${{ !contains(matrix.platform_key, 'darwin') }}
@@ -523,8 +532,8 @@ jobs:
         run: |
           set -euo pipefail
           case "${{ matrix.platform_key }}" in
-            darwin-aarch64)
-              cargo build --release --package xero-desktop-sidecar --target aarch64-apple-darwin
+            darwin-*)
+              cargo build --release --package xero-desktop-sidecar --target ${{ matrix.target }}
               ;;
             *)
               cargo build --release --package xero-desktop-sidecar
diff --git a/client/package.json b/client/package.json
index 1eb2bba3..202fe847 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "my-project",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "private": true,
   "scripts": {
     "dev": "vite --host 0.0.0.0 --port 3000",
diff --git a/client/src-tauri/Cargo.lock b/client/src-tauri/Cargo.lock
index 2bda3c36..01f77b8a 100644
--- a/client/src-tauri/Cargo.lock
+++ b/client/src-tauri/Cargo.lock
@@ -11839,7 +11839,7 @@ dependencies = [
 
 [[package]]
 name = "xero-cli"
-version = "0.1.33"
+version = "0.1.34"
 dependencies = [
  "crossterm",
  "flate2",
@@ -11860,7 +11860,7 @@ dependencies = [
 
 [[package]]
 name = "xero-desktop"
-version = "0.1.33"
+version = "0.1.34"
 dependencies = [
  "arc-swap",
  "arrow-array",
diff --git a/client/src-tauri/Cargo.toml b/client/src-tauri/Cargo.toml
index 12b73547..dec35bd2 100644
--- a/client/src-tauri/Cargo.toml
+++ b/client/src-tauri/Cargo.toml
@@ -12,7 +12,7 @@ resolver = "2"
 
 [package]
 name = "xero-desktop"
-version = "0.1.33"
+version = "0.1.34"
 edition = "2021"
 default-run = "xero-desktop"
 description = "Xero desktop host"
diff --git a/client/src-tauri/crates/xero-cli/Cargo.toml b/client/src-tauri/crates/xero-cli/Cargo.toml
index ea42afb8..56e86895 100644
--- a/client/src-tauri/crates/xero-cli/Cargo.toml
+++ b/client/src-tauri/crates/xero-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xero-cli"
-version = "0.1.33"
+version = "0.1.34"
 edition = "2021"
 description = "Headless Xero CLI backed by xero-agent-core"
 
diff --git a/client/src-tauri/tauri.conf.json b/client/src-tauri/tauri.conf.json
index aabf8fe5..7e9945dd 100644
--- a/client/src-tauri/tauri.conf.json
+++ b/client/src-tauri/tauri.conf.json
@@ -2,7 +2,7 @@
   "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
   "productName": "Xero",
   "mainBinaryName": "xero-desktop",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "identifier": "com.hyperpush.xero",
   "build": {
     "beforeDevCommand": "pnpm dev",