Skip to content

Commit 5ef3ccb

Browse files
modstartmodstart
committed
新增：MacOS 打包使用官方证书
1 parent 46b9044 commit 5ef3ccb

3 files changed

Lines changed: 47 additions & 39 deletions

File tree

‎.github/workflows/main-build.yml‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,33 @@ jobs:
3737
- name: Cert Prepare (macOS)
3838
if: runner.os == 'macOS'
3939
env:
40-
MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
41-
MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
40+
MACOS_CERTIFICATE: ${{ secrets.CORP_MACOS_CERTIFICATE }}
41+
MACOS_CERTIFICATE_PASSWORD: ${{ secrets.CORP_MACOS_CERTIFICATE_PASSWORD }}
4242
run: |
4343
echo "find-identity"
4444
security find-identity -p codesigning
4545
echo "$MACOS_CERTIFICATE" | base64 --decode > certificate.p12
46-
security create-keychain -p "" build.keychain
47-
security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
48-
security list-keychains -s build.keychain
49-
security set-keychain-settings -t 3600 -u build.keychain
50-
security unlock-keychain -p "" build.keychain
51-
echo "find-identity"
52-
security find-identity -v -p codesigning build.keychain
53-
echo "find-identity"
54-
security find-identity -p codesigning
55-
echo "set-key-partition-list"
56-
security set-key-partition-list -S apple-tool:,apple: -s -k "" -l "FocusAnyKey" -t private build.keychain
57-
echo "find-certificate"
58-
security find-certificate -a -c "FocusAnyKey" -p
59-
echo "export"
60-
security export -k build.keychain -t certs -f x509 -p -o certificate.cer
61-
echo "add-trusted-cert"
62-
sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain certificate.cer
46+
security import certificate.p12 -P "$MACOS_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
47+
# echo "find-identity"
48+
# security find-identity -p codesigning
49+
# echo "$MACOS_CERTIFICATE" | base64 --decode > certificate.p12
50+
# security create-keychain -p "" build.keychain
51+
# security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
52+
# security list-keychains -s build.keychain
53+
# security set-keychain-settings -t 3600 -u build.keychain
54+
# security unlock-keychain -p "" build.keychain
55+
# echo "find-identity"
56+
# security find-identity -v -p codesigning build.keychain
57+
# echo "find-identity"
58+
# security find-identity -p codesigning
59+
# echo "set-key-partition-list"
60+
# security set-key-partition-list -S apple-tool:,apple: -s -k "" -l "FocusAnyKey" -t private build.keychain
61+
# echo "find-certificate"
62+
# security find-certificate -a -c "FocusAnyKey" -p
63+
# echo "export"
64+
# security export -k build.keychain -t certs -f x509 -p -o certificate.cer
65+
# echo "add-trusted-cert"
66+
# sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain certificate.cer
6367
echo "find-identity"
6468
security find-identity -p codesigning
6569

‎.github/workflows/tag-release.yml‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,33 @@ jobs:
3636
- name: Cert Prepare (macOS)
3737
if: runner.os == 'macOS'
3838
env:
39-
MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
40-
MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
39+
MACOS_CERTIFICATE: ${{ secrets.CORP_MACOS_CERTIFICATE }}
40+
MACOS_CERTIFICATE_PASSWORD: ${{ secrets.CORP_MACOS_CERTIFICATE_PASSWORD }}
4141
run: |
4242
echo "find-identity"
4343
security find-identity -p codesigning
4444
echo "$MACOS_CERTIFICATE" | base64 --decode > certificate.p12
45-
security create-keychain -p "" build.keychain
46-
security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
47-
security list-keychains -s build.keychain
48-
security set-keychain-settings -t 3600 -u build.keychain
49-
security unlock-keychain -p "" build.keychain
50-
echo "find-identity"
51-
security find-identity -v -p codesigning build.keychain
52-
echo "find-identity"
53-
security find-identity -p codesigning
54-
echo "set-key-partition-list"
55-
security set-key-partition-list -S apple-tool:,apple: -s -k "" -l "FocusAnyKey" -t private build.keychain
56-
echo "find-certificate"
57-
security find-certificate -a -c "FocusAnyKey" -p
58-
echo "export"
59-
security export -k build.keychain -t certs -f x509 -p -o certificate.cer
60-
echo "add-trusted-cert"
61-
sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain certificate.cer
45+
security import certificate.p12 -P "$MACOS_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
46+
# echo "find-identity"
47+
# security find-identity -p codesigning
48+
# echo "$MACOS_CERTIFICATE" | base64 --decode > certificate.p12
49+
# security create-keychain -p "" build.keychain
50+
# security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
51+
# security list-keychains -s build.keychain
52+
# security set-keychain-settings -t 3600 -u build.keychain
53+
# security unlock-keychain -p "" build.keychain
54+
# echo "find-identity"
55+
# security find-identity -v -p codesigning build.keychain
56+
# echo "find-identity"
57+
# security find-identity -p codesigning
58+
# echo "set-key-partition-list"
59+
# security set-key-partition-list -S apple-tool:,apple: -s -k "" -l "FocusAnyKey" -t private build.keychain
60+
# echo "find-certificate"
61+
# security find-certificate -a -c "FocusAnyKey" -p
62+
# echo "export"
63+
# security export -k build.keychain -t certs -f x509 -p -o certificate.cer
64+
# echo "add-trusted-cert"
65+
# sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain certificate.cer
6266
echo "find-identity"
6367
security find-identity -p codesigning
6468

‎electron-builder.json5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"darkModeSupport": false,
132132
"hardenedRuntime": true,
133133
"gatekeeperAssess": false,
134-
"identity": "FocusAnyKey",
134+
"identity": "Xi'an Yanyi Information Technology Co., Ltd (Q96H3H33RK)",
135135
},
136136
"linux": {
137137
"icon": "logo.icns",

0 commit comments

Comments
 (0)