From fbcddc40dbb497380f9cf0e7f606cdf27df13f5c Mon Sep 17 00:00:00 2001
From: H-Chris233 <h-chris233@outlook.com>
Date: Mon, 4 May 2026 00:26:44 +0800
Subject: [PATCH] Add Intel macOS artifacts to Tauri release matrix

The release workflow only produced Apple Silicon macOS packages, so Intel
users had no official GitHub Release artifact. Extend the matrix with an
x86_64 macOS lane and align artifact naming and updater-manifest paths
with per-arch outputs.

Constraint: Keep existing release pipeline shape and signing flow unchanged
Rejected: Split Intel build into separate workflow file | higher maintenance and duplicated logic
Confidence: high
Scope-risk: narrow
Reversibility: clean
Directive: Keep macOS conditions architecture-agnostic so new mac runners are not skipped accidentally
Tested: YAML syntax parse via python yaml.safe_load; workflow diff reviewed for mac gating/artifact paths
Not-tested: Full GitHub Actions matrix run on tag push
---
 .github/workflows/release-tauri.yml | 30 ++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release-tauri.yml b/.github/workflows/release-tauri.yml
index 6b8a2ba9..7ac2b68e 100644
--- a/.github/workflows/release-tauri.yml
+++ b/.github/workflows/release-tauri.yml
@@ -4,7 +4,7 @@ name: Release Tauri (cross-platform)
 #   - 手动 dispatch（用于测试构建,不发版）
 #
 # 输出：
-#   macOS arm64 .dmg + Windows x64 .msi/.exe + Linux x64 .deb/.rpm/.AppImage，自动作为 GitHub Release 资产上传。
+#   macOS arm64/x64 .dmg + Windows x64 .msi/.exe + Linux x64 .deb/.rpm/.AppImage，自动作为 GitHub Release 资产上传。
 #
 # macOS 分发：
 #   - 配好 APPLE_CERTIFICATE / APPLE_CERTIFICATE_PASSWORD / APPLE_ID /
@@ -32,6 +32,10 @@ jobs:
             rust-target: aarch64-apple-darwin
             updater-target: darwin
             updater-arch: aarch64
+          - platform: macos-13
+            rust-target: x86_64-apple-darwin
+            updater-target: darwin
+            updater-arch: x86_64
           - platform: windows-latest
             rust-target: x86_64-pc-windows-msvc
             updater-target: windows
@@ -97,7 +101,7 @@ jobs:
           fi
 
       - name: Check Apple signing availability
-        if: matrix.platform == 'macos-latest' && startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-tauri')
+        if: startsWith(matrix.platform, 'macos') && startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-tauri')
         shell: bash
         env:
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
@@ -117,7 +121,7 @@ jobs:
           fi
 
       - name: Import Apple Developer ID certificate
-        if: matrix.platform == 'macos-latest'
+        if: startsWith(matrix.platform, 'macos')
         shell: bash
         env:
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
@@ -158,7 +162,7 @@ jobs:
           echo "Imported Apple signing identity: $CERT_ID"
 
       - name: Configure Apple notarization
-        if: matrix.platform == 'macos-latest'
+        if: startsWith(matrix.platform, 'macos')
         shell: bash
         env:
           APPLE_ID: ${{ secrets.APPLE_ID }}
@@ -175,7 +179,7 @@ jobs:
 
       # ── macOS：用我们自己的 build-mac.sh，统一处理签名、公证和 artifact 清理 ──
       - name: Build (macOS)
-        if: matrix.platform == 'macos-latest'
+        if: startsWith(matrix.platform, 'macos')
         working-directory: 'openless-all/app'
         env:
           INSTALL: '0'        # CI 不要装到 /Applications,也不要 reset TCC
@@ -237,7 +241,7 @@ jobs:
       # 让"云端 artifact 一定干净"成为可验证的承诺。用户下载后再被本地浏览器
       # 加 quarantine 时，按 release notes 的 `xattr -cr` 一行即可消除。
       - name: Strip xattr / quarantine on macOS bundles
-        if: matrix.platform == 'macos-latest'
+        if: startsWith(matrix.platform, 'macos')
         shell: bash
         working-directory: 'openless-all/app/src-tauri/target/release/bundle'
         run: |
@@ -250,24 +254,24 @@ jobs:
           done
 
       - name: Upload macOS artifacts
-        if: matrix.platform == 'macos-latest'
+        if: startsWith(matrix.platform, 'macos')
         uses: actions/upload-artifact@v4
         with:
-          name: openless-macos-arm64
+          name: openless-macos-${{ matrix.updater-arch }}
           path: |
             openless-all/app/src-tauri/target/release/bundle/dmg/*.dmg
           if-no-files-found: error
 
       - name: Upload macOS updater artifacts
-        if: matrix.platform == 'macos-latest' && env.TAURI_SIGNING_PRIVATE_KEY != ''
+        if: startsWith(matrix.platform, 'macos') && env.TAURI_SIGNING_PRIVATE_KEY != ''
         uses: actions/upload-artifact@v4
         with:
-          name: openless-macos-arm64-updater
+          name: openless-macos-${{ matrix.updater-arch }}-updater
           path: |
             openless-all/app/src-tauri/target/release/bundle/macos/*.app.tar.gz
             openless-all/app/src-tauri/target/release/bundle/macos/*.app.tar.gz.sig
-            openless-all/app/src-tauri/target/release/bundle/latest-darwin-aarch64.json
-            openless-all/app/src-tauri/target/release/bundle/latest-darwin-aarch64-mirror.json
+            openless-all/app/src-tauri/target/release/bundle/latest-darwin-${{ matrix.updater-arch }}.json
+            openless-all/app/src-tauri/target/release/bundle/latest-darwin-${{ matrix.updater-arch }}-mirror.json
           if-no-files-found: error
 
       - name: Upload Windows artifacts
@@ -325,7 +329,7 @@ jobs:
           prerelease: false
           # Matrix jobs all upload assets to the same release. Generate notes once
           # so macOS, Windows, and Linux jobs do not duplicate the release body.
-          generate_release_notes: ${{ matrix.platform == 'macos-latest' }}
+          generate_release_notes: ${{ matrix.updater-target == 'darwin' && matrix.updater-arch == 'aarch64' }}
           files: |
             openless-all/app/src-tauri/target/release/bundle/dmg/*.dmg
             openless-all/app/src-tauri/target/release/bundle/macos/*.app.tar.gz