chore: update macOS build process and configuration

- Modified GitHub Actions workflow to support multiple macOS architectures (aarch64 and x86_64).
- Enhanced Tauri build script to accommodate new signing identity handling.
- Updated tauri.conf.json to include macOS entitlements and minimum system version requirements.
- Adjusted TypeScript environment imports for consistency.

Author: BunsDev

.github/workflows/release.yml

@@ -70,6 +70,13 @@ jobs:
 
   build-macos:
     runs-on: macos-latest
+    strategy:
+      matrix:
+        include:
+          - target: aarch64-apple-darwin
+            arch: aarch64
+          - target: x86_64-apple-darwin
+            arch: x86_64
     steps:
       - uses: actions/checkout@v4
         with:
@@ -85,6 +92,8 @@ jobs:
           cache: 'pnpm'
 
       - uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.target }}
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -99,28 +108,40 @@ jobs:
       - name: Verify version sync
         run: node scripts/sync-versions.mjs --check
 
-      - name: Build Tauri (macOS)
-        run: cargo-tauri build --bundles dmg
-        env:
-          CI: true
-
-      - name: Sign and notarize (if credentials available)
+      - name: Import Apple Developer Certificate
         if: env.APPLE_CERTIFICATE != ''
         env:
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          echo "$APPLE_CERTIFICATE" | base64 --decode > certificate.p12
+          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
+          security set-keychain-settings -t 3600 -u build.keychain
+          security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
+          IDENTITY=$(security find-identity -v -p codesigning build.keychain | head -1 | awk -F'"' '{print $2}')
+          echo "APPLE_SIGNING_IDENTITY=$IDENTITY" >> "$GITHUB_ENV"
+          echo "Certificate imported: $IDENTITY"
+          rm certificate.p12
+
+      - name: Build Tauri (macOS ${{ matrix.arch }})
+        run: cargo-tauri build --target ${{ matrix.target }} --bundles dmg
+        env:
+          CI: true
+          APPLE_SIGNING_IDENTITY: ${{ env.APPLE_SIGNING_IDENTITY || '-' }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
-        run: |
-          echo "Signing credentials found — signing will be handled by Tauri bundle config"
 
       - name: Upload macOS artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: macos-builds
+          name: macos-builds-${{ matrix.arch }}
           path: |
-            src-tauri/target/release/bundle/dmg/*.dmg
+            src-tauri/target/${{ matrix.target }}/release/bundle/dmg/*.dmg
 
   build-windows:
     runs-on: windows-latest

next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

scripts/sign-and-deploy.sh

@@ -150,10 +150,10 @@ if [ "$SKIP_BUILD" = false ]; then
   rustup target add aarch64-apple-darwin 2>/dev/null || true
 
   APPLE_SIGNING_IDENTITY="$APPLE_SIGNING_IDENTITY" \
-  APPLE_ID="$APPLE_ID" \
+  APPLE_ID="${APPLE_ID:-}" \
   APPLE_TEAM_ID="$APPLE_TEAM_ID" \
-  APPLE_APP_SPECIFIC_PASSWORD="$APPLE_APP_SPECIFIC_PASSWORD" \
-    pnpm tauri build --target aarch64-apple-darwin
+  APPLE_PASSWORD="${APPLE_APP_SPECIFIC_PASSWORD:-}" \
+    npx @tauri-apps/cli build --target aarch64-apple-darwin
 
   ok "Tauri build complete"
 else

src-tauri/tauri.conf.json

@@ -39,6 +39,10 @@
       "icons/icon.icns",
       "icons/icon.ico"
     ],
+    "macOS": {
+      "entitlements": "Entitlements.plist",
+      "minimumSystemVersion": "10.15"
+    },
     "iOS": {
       "minimumSystemVersion": "17.0",
       "infoPlist": "Info.ios.plist",