diff --git a/.github/workflows/desktop-client-dev.yml b/.github/workflows/desktop-client-dev.yml index 5f26c80..5e4c5fe 100644 --- a/.github/workflows/desktop-client-dev.yml +++ b/.github/workflows/desktop-client-dev.yml @@ -140,7 +140,7 @@ jobs: rm -f "$CERTIFICATE_PATH" - name: 根据平台创建安装包 - timeout-minutes: 45 + timeout-minutes: 60 working-directory: ./desktop-client env: # 不传 CSC_LINK:使用上一步导入的钥匙串,避免再建缺 codesign: 的临时钥匙串 @@ -158,7 +158,7 @@ jobs: - name: 构建绿色安装包 if: matrix.green_command != 'null' - timeout-minutes: 45 + timeout-minutes: 60 working-directory: ./desktop-client env: CSC_IDENTITY_AUTO_DISCOVERY: ${{ startsWith(matrix.os, 'macos') && 'true' || 'false' }} diff --git a/desktop-client/scripts/electron-builder.config.js b/desktop-client/scripts/electron-builder.config.js index f0991c9..b7bd2f3 100644 --- a/desktop-client/scripts/electron-builder.config.js +++ b/desktop-client/scripts/electron-builder.config.js @@ -45,16 +45,8 @@ module.exports = { }, mac: { icon: "assets/icons/logo.icns", - target: [ - { - target: "dmg", - arch: "arm64" - }, - { - target: "dmg", - arch: "x64" - } - ], + // 架构由 CLI --arm64 / --x64 决定,避免单个 job 打双架构导致超时 + target: ["dmg"], artifactName: "capcut-mate-macos-${arch}-installer.dmg", category: "public.app-category.productivity", hardenedRuntime: true,