From 48e7efe92a0808de91286cea1e04713ae7e157e8 Mon Sep 17 00:00:00 2001 From: wangjia <809946525@qq.com> Date: Tue, 7 Jul 2026 08:14:10 +0800 Subject: [PATCH] =?UTF-8?q?ci(client):=20mac/iOS=20=E8=AF=81=E4=B9=A6=20en?= =?UTF-8?q?v=20=E6=98=A0=E5=B0=84=E5=88=B0=E5=85=A8=E5=B1=80=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E7=9F=AD=E5=90=8D=E5=AF=86=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apple 证书/公证密钥是账号级、跨项目唯一 → 放全局(用户级)密钥用通用短名 (DEVELOPER_ID_P12/P12_PASSWORD/IOS_DIST_P12/IOS_DIST_PASSWORD/APPSTORE_*), workflow env 里把脚本期望的长名映射过去,脚本不动。描述文件(与 bundle id 绑定) 仍走项目级。修此前 build-macos/ios 因密钥名对不上取不到证书。 Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_013nMthbVEmQquxBRKb9Fj8u --- .gitea/workflows/deploy-client.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/deploy-client.yml b/.gitea/workflows/deploy-client.yml index 93d72c2..aeab948 100644 --- a/.gitea/workflows/deploy-client.yml +++ b/.gitea/workflows/deploy-client.yml @@ -109,8 +109,11 @@ jobs: - name: Compile (macOS System Extension app) env: - MACOS_DEVELOPER_ID_CERT_P12_BASE64: ${{ secrets.MACOS_DEVELOPER_ID_CERT_P12_BASE64 }} - MACOS_DEVELOPER_ID_CERT_PASSWORD: ${{ secrets.MACOS_DEVELOPER_ID_CERT_PASSWORD }} + # 左=脚本期望的 env 名(勿改),右=实际密钥名。Apple 证书/公证密钥是 + # 账号级、跨项目唯一 → 放【全局(用户级)密钥】用通用短名,pangolin/jiu 各自 + # 在此映射到自己脚本的 env。Developer ID Application 证书=站外分发,一张签所有 app。 + MACOS_DEVELOPER_ID_CERT_P12_BASE64: ${{ secrets.DEVELOPER_ID_P12 }} + MACOS_DEVELOPER_ID_CERT_PASSWORD: ${{ secrets.P12_PASSWORD }} MACOS_APP_PROVISION_PROFILE_BASE64: ${{ secrets.MACOS_APP_PROVISION_PROFILE_BASE64 }} MACOS_SYSEXT_PROVISION_PROFILE_BASE64: ${{ secrets.MACOS_SYSEXT_PROVISION_PROFILE_BASE64 }} APPSTORE_API_KEY_ID: ${{ secrets.APPSTORE_API_KEY_ID }} @@ -137,8 +140,10 @@ jobs: - name: Compile & upload to TestFlight (iOS) env: - IOS_DIST_CERT_P12_BASE64: ${{ secrets.IOS_DIST_CERT_P12_BASE64 }} - IOS_DIST_CERT_PASSWORD: ${{ secrets.IOS_DIST_CERT_PASSWORD }} + # 证书=账号级 →【全局】通用短名(Apple Distribution 证书,签 iOS App Store/TestFlight); + # 描述文件=与 bundle id 绑定 →【项目级】pangolin 仓库密钥。 + IOS_DIST_CERT_P12_BASE64: ${{ secrets.IOS_DIST_P12 }} + IOS_DIST_CERT_PASSWORD: ${{ secrets.IOS_DIST_PASSWORD }} IOS_APP_PROVISIONING_PROFILE_BASE64: ${{ secrets.IOS_APP_PROVISIONING_PROFILE_BASE64 }} IOS_PACKETTUNNEL_PROVISIONING_PROFILE_BASE64: ${{ secrets.IOS_PACKETTUNNEL_PROVISIONING_PROFILE_BASE64 }} APPSTORE_API_KEY_ID: ${{ secrets.APPSTORE_API_KEY_ID }}