Update macOS build workflow to use matrix strategy for universal binary creation

Author: 123vivekr

.github/workflows/build-macos.yml

@@ -7,16 +7,23 @@ on:
 
 jobs:
   build:
-    name: Build macOS Universal
-    runs-on: macos-latest
+    name: Build macOS ${{ matrix.target }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - os: macos-13  # Intel
+            target: x86_64-apple-darwin
+            arch: x86_64
+          - os: macos-14  # Apple Silicon
+            target: aarch64-apple-darwin
+            arch: aarch64
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: aarch64-apple-darwin,x86_64-apple-darwin
 
       - name: Setup Rust cache
         uses: Swatinem/rust-cache@v2
@@ -52,34 +59,73 @@ jobs:
           security set-key-partition-list -S apple-tool:,apple: -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
           security list-keychain -d user -s $KEYCHAIN_PATH
       
-      - name: Build for ARM64
-        run: bun run tauri build -- --target aarch64-apple-darwin
+      - name: Build native
+        run: bun run tauri build
 
-      - name: Build for x86_64
-        run: bun run tauri build -- --target x86_64-apple-darwin
+      - name: Upload architecture-specific artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-${{ matrix.arch }}
+          path: |
+            src-tauri/target/release/bundle/macos/Claudia.app
+            src-tauri/target/release/bundle/dmg/*.dmg
+          retention-days: 1
+  
+  universal:
+    name: Create Universal Binary
+    needs: build
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: macos-*
+          path: artifacts
 
-      - name: Create universal binary
+      - name: Import Apple certificates
+        env:
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
         run: |
-          mkdir -p src-tauri/target/universal-apple-darwin/release
-          lipo -create -output src-tauri/target/universal-apple-darwin/release/claudia \
-            src-tauri/target/aarch64-apple-darwin/release/claudia \
-            src-tauri/target/x86_64-apple-darwin/release/claudia
+          # Create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
           
-          echo "✅ Universal binary created"
-          lipo -info src-tauri/target/universal-apple-darwin/release/claudia
+          # Import certificate from secrets
+          echo -n "$APPLE_CERTIFICATE" | base64 --decode -o $CERTIFICATE_PATH
+          
+          # Create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          
+          # Import certificate to keychain
+          security import $CERTIFICATE_PATH -P "$APPLE_CERTIFICATE_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security set-key-partition-list -S apple-tool:,apple: -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security list-keychain -d user -s $KEYCHAIN_PATH
       
-      - name: Prepare app bundle with universal binary
+      - name: Create universal app
         run: |
           # Create temp directory
           mkdir -p dmg_temp
           
-          # Copy the app bundle from one of the architecture-specific builds
-          # Using the ARM64 build as the base (either architecture works since we'll replace the binary)
-          cp -R src-tauri/target/aarch64-apple-darwin/release/bundle/macos/Claudia.app dmg_temp/
+          # Extract both app bundles
+          cp -R artifacts/macos-aarch64/Claudia.app dmg_temp/
+          
+          # Extract x86_64 binary
+          mkdir -p temp_x86
+          cp -R artifacts/macos-x86_64/Claudia.app temp_x86/
           
-          # Replace the binary with universal binary
-          rm -f dmg_temp/Claudia.app/Contents/MacOS/claudia
-          cp src-tauri/target/universal-apple-darwin/release/claudia dmg_temp/Claudia.app/Contents/MacOS/claudia
+          # Create universal binary using lipo
+          lipo -create -output dmg_temp/Claudia.app/Contents/MacOS/claudia \
+            dmg_temp/Claudia.app/Contents/MacOS/claudia \
+            temp_x86/Claudia.app/Contents/MacOS/claudia
+          
+          echo "✅ Universal binary created"
+          lipo -info dmg_temp/Claudia.app/Contents/MacOS/claudia
       
       - name: Sign app bundle
         env: