Skip to content

Commit 4ac54db

Browse files
committed
Fix signing key import for 3rd party PR CI runs
1 parent cf55096 commit 4ac54db

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

.github/workflows/main.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,47 @@ jobs:
2929

3030
- name: Import signing keys
3131
run: |
32+
KEYS_INSTALLED=0
33+
3234
security create-keychain -p password build.keychain
3335
security default-keychain -s ~/Library/Keychains/build.keychain
3436
3537
if [ ! -z "${{ secrets.CERT_APPLE_DISTRIBUTION_P12 }}" ]; then
3638
base64 -D <<< "${{ secrets.CERT_APPLE_DISTRIBUTION_P12 }}" > Apple_Distribution_Z52EFCPL6D.p12
3739
security import ./Apple_Distribution_Z52EFCPL6D.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
40+
KEYS_INSTALLED=1
3841
fi
3942
4043
if [ ! -z "${{ secrets.CERT_APPLE_DEVELOPMENT_P12 }}" ]; then
4144
base64 -D <<< "${{ secrets.CERT_APPLE_DEVELOPMENT_P12 }}" > Apple_Development_N952V7G2F5.p12
4245
security import ./Apple_Development_N952V7G2F5.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
46+
KEYS_INSTALLED=1
4347
fi
4448
4549
if [ ! -z "${{ secrets.CERT_IOS_DEVELOPMENT_P12 }}" ]; then
4650
base64 -D <<< "${{ secrets.CERT_IOS_DEVELOPMENT_P12 }}" > Ios_Development_N952V7G2F5.p12
4751
security import ./Ios_Development_N952V7G2F5.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
52+
KEYS_INSTALLED=1
4853
fi
4954
5055
if [ ! -z "${{ secrets.CERT_IOS_DISTRIBUTION_P12 }}" ]; then
5156
base64 -D <<< "${{ secrets.CERT_IOS_DISTRIBUTION_P12 }}" > Ios_Distribution_N952V7G2F5.p12
5257
security import ./Ios_Distribution_N952V7G2F5.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
58+
KEYS_INSTALLED=1
5359
fi
5460
5561
if [ ! -z "${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}" ]; then
5662
base64 -D <<< "${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}" > Developer_ID_Application_Z52EFCPL6D.p7b
5763
security import ./Developer_ID_Application_Z52EFCPL6D.p7b -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
64+
KEYS_INSTALLED=1
5865
fi
5966
6067
# Unlock
6168
security unlock-keychain -p password ~/Library/Keychains/build.keychain
6269
security set-keychain-settings -lu
63-
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k password ~/Library/Keychains/build.keychain
70+
if [[ ${KEYS_INSTALLED} -eq 1 ]]; then
71+
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k password ~/Library/Keychains/build.keychain
72+
fi
6473
6574
- name: Import provisioning profile
6675
run: |
@@ -387,38 +396,47 @@ jobs:
387396
steps:
388397
- name: Import signing keys
389398
run: |
399+
KEYS_INSTALLED=0
400+
390401
security create-keychain -p password build.keychain
391402
security default-keychain -s ~/Library/Keychains/build.keychain
392403
393404
if [ ! -z "${{ secrets.CERT_APPLE_DISTRIBUTION }}" ]; then
394405
base64 -D <<< "${{ secrets.CERT_APPLE_DISTRIBUTION }}" > Apple_Distribution_Z52EFCPL6D.p7b
395406
security import ./Apple_Distribution_Z52EFCPL6D.p7b -k ~/Library/Keychains/build.keychain -T /usr/bin/codesign
407+
KEYS_INSTALLED=1
396408
fi
397409
398410
if [ ! -z "${{ secrets.CERT_APPLE_DEVELOPMENT }}" ]; then
399411
base64 -D <<< "${{ secrets.CERT_APPLE_DEVELOPMENT }}" > Apple_Development_N952V7G2F5.p7b
400412
security import ./Apple_Development_N952V7G2F5.p7b -k ~/Library/Keychains/build.keychain -T /usr/bin/codesign
413+
KEYS_INSTALLED=1
401414
fi
402415
403416
if [ ! -z "${{ secrets.CERT_APPLE_DISTRIBUTION_P12 }}" ]; then
404417
base64 -D <<< "${{ secrets.CERT_APPLE_DISTRIBUTION_P12 }}" > Apple_Distribution_Z52EFCPL6D.p12
405418
security import ./Apple_Distribution_Z52EFCPL6D.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
419+
KEYS_INSTALLED=1
406420
fi
407421
408422
if [ ! -z "${{ secrets.CERT_APPLE_DEVELOPMENT_P12 }}" ]; then
409423
base64 -D <<< "${{ secrets.CERT_APPLE_DEVELOPMENT_P12 }}" > Apple_Development_N952V7G2F5.p12
410424
security import ./Apple_Development_N952V7G2F5.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
425+
KEYS_INSTALLED=1
411426
fi
412427
413428
if [ ! -z "${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}" ]; then
414429
base64 -D <<< "${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}" > Developer_ID_Application_Z52EFCPL6D.p7b
415430
security import ./Developer_ID_Application_Z52EFCPL6D.p7b -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
431+
KEYS_INSTALLED=1
416432
fi
417433
418434
# Unlock
419435
security unlock-keychain -p password ~/Library/Keychains/build.keychain
420436
security set-keychain-settings -lu
421-
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k password ~/Library/Keychains/build.keychain
437+
if [[ ${KEYS_INSTALLED} -eq 1 ]]; then
438+
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k password ~/Library/Keychains/build.keychain
439+
fi
422440
423441
- uses: actions/checkout@v4
424442
with:

0 commit comments

Comments
 (0)