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 }}