删除掉绿色包的打包逻辑

Author: Hommy

.github/workflows/desktop-client-dev.yml

@@ -51,21 +51,15 @@ jobs:
           - os: windows-2022
             platform: win
             artifact_name: windows-build
-            build_command: build-win
             installer_command: build-win-installer
-            green_command: build-win-green
           - os: macos-14
             platform: mac
             artifact_name: macos-build
-            build_command: build-mac
             installer_command: build-mac-installer
-            green_command: build-mac-green
           - os: macos-15-intel
             platform: mac-x64
             artifact_name: macos-build-x64
-            build_command: build-mac-x64
             installer_command: build-mac-x64-installer
-            green_command: build-mac-x64-green
 
     steps:
       - name: 准备代码
@@ -141,7 +135,7 @@ jobs:
           rm -f "$CERTIFICATE_PATH"
 
       - name: 根据平台创建安装包
-        timeout-minutes: 60
+        timeout-minutes: 75
         working-directory: ./desktop-client
         env:
           # 不传 CSC_LINK：使用上一步导入的钥匙串，避免再建缺 codesign: 的临时钥匙串
@@ -157,23 +151,6 @@ jobs:
           npm run ${{ matrix.installer_command }}
         shell: bash
 
-      - name: 构建绿色安装包
-        if: matrix.green_command != 'null'
-        timeout-minutes: 60
-        working-directory: ./desktop-client
-        env:
-          CSC_IDENTITY_AUTO_DISCOVERY: ${{ startsWith(matrix.os, 'macos') && 'true' || 'false' }}
-          APPLE_ID: ${{ startsWith(matrix.os, 'macos') && secrets.APPLE_ID || '' }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ startsWith(matrix.os, 'macos') && secrets.APPLE_APP_SPECIFIC_PASSWORD || '' }}
-          APPLE_TEAM_ID: ${{ startsWith(matrix.os, 'macos') && secrets.APPLE_TEAM_ID || '' }}
-        run: |
-          if [ -n "${KEYCHAIN_PATH:-}" ]; then
-            security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
-            security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
-          fi
-          npm run ${{ matrix.green_command }}
-        shell: bash
-
       - name: 清理 macOS 签名钥匙串
         if: always() && startsWith(matrix.os, 'macos')
         run: |
@@ -194,14 +171,6 @@ jobs:
           path: desktop-client/dist/
           if-no-files-found: ignore
 
-      - name: 上传绿色安装包构件
-        if: matrix.green_command != 'null'
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.artifact_name }}-green
-          path: desktop-client/dist/*.zip
-          if-no-files-found: ignore
-
       - name: 发布版本
         if: startsWith(github.ref, 'refs/tags/v')
         uses: softprops/action-gh-release@v1
@@ -212,7 +181,6 @@ jobs:
             desktop-client/dist/capcut-mate-windows-x64-installer.exe
             desktop-client/dist/capcut-mate-macos-arm64-installer.dmg
             desktop-client/dist/capcut-mate-macos-x64-installer.dmg
-            desktop-client/dist/*.zip
           overwrite: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

desktop-client/package.json

@@ -14,10 +14,7 @@
     "build-mac-x64": "electron-packager . CapCut-Mate --platform=darwin --arch=x64 --out dist --overwrite --icon=assets/icons/logo.icns --ignore=.gitignore --ignore=.github --ignore=README.md --ignore=scripts --ignore=web",
     "build-win-installer": "electron-builder --win nsis --x64 --config ./scripts/electron-builder.config.js --publish never",
     "build-mac-installer": "electron-builder --mac --arm64 --config ./scripts/electron-builder.config.js --publish never",
-    "build-mac-x64-installer": "electron-builder --mac --x64 --config ./scripts/electron-builder.config.js --publish never",
-    "build-win-green": "electron-builder --win zip --x64 --config ./scripts/electron-builder-green.config.js --publish never",
-    "build-mac-green": "electron-builder --mac zip --arm64 --config ./scripts/electron-builder-green.config.js --publish never",
-    "build-mac-x64-green": "electron-builder --mac zip --x64 --config ./scripts/electron-builder-green.config.js --publish never"
+    "build-mac-x64-installer": "electron-builder --mac --x64 --config ./scripts/electron-builder.config.js --publish never"
   },
   "devDependencies": {
     "@electron/notarize": "^3.1.1",

desktop-client/scripts/electron-builder-green.config.js

@@ -5,10 +5,6 @@
 const path = require("path");
 const { execFileSync } = require("child_process");
 
-function loadNotarize() {
-  return require("@electron/notarize");
-}
-
 module.exports = async function notarizeAfterSign(context) {
   const { electronPlatformName, appOutDir } = context;
   if (electronPlatformName !== "darwin") return;
@@ -21,32 +17,45 @@ module.exports = async function notarizeAfterSign(context) {
     return;
   }
 
-  const { notarize } = loadNotarize();
+  // 长时间打包后钥匙串可能再次上锁，公证前先解锁
+  const keychainPath = process.env.KEYCHAIN_PATH;
+  const keychainPassword = process.env.KEYCHAIN_PASSWORD;
+  if (keychainPath && keychainPassword) {
+    try {
+      execFileSync("security", ["unlock-keychain", "-p", keychainPassword, keychainPath], {
+        stdio: "inherit"
+      });
+    } catch (err) {
+      console.warn("unlock-keychain failed:", err && err.message ? err.message : err);
+    }
+  }
+
+  const { notarize } = require("@electron/notarize");
   const appName = context.packager.appInfo.productFilename;
   const appPath = path.join(appOutDir, `${appName}.app`);
 
   const maxAttempts = 5;
   let lastError;
 
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    const started = Date.now();
     try {
       console.log(`notarizing ${appPath} (attempt ${attempt}/${maxAttempts})`);
+      // @electron/notarize v3：提交公证并自动 staple
       await notarize({
         appPath,
         appleId,
         appleIdPassword,
         teamId
       });
-      console.log("notarization successful, stapling...");
-      execFileSync("xcrun", ["stapler", "staple", "-v", appPath], { stdio: "inherit" });
-      console.log("staple successful");
+      console.log(`notarization successful in ${Math.round((Date.now() - started) / 1000)}s`);
       return;
     } catch (err) {
       lastError = err;
       const message = err && err.message ? err.message : String(err);
-      console.warn(`notarize attempt ${attempt} failed: ${message}`);
+      console.warn(`notarize attempt ${attempt} failed after ${Math.round((Date.now() - started) / 1000)}s: ${message}`);
       if (attempt < maxAttempts) {
-        const waitSec = attempt * 45;
+        const waitSec = attempt * 60;
         console.log(`waiting ${waitSec}s before retry...`);
         await new Promise((resolve) => setTimeout(resolve, waitSec * 1000));
       }