Skip to content

Commit a63649a

Browse files
committed
Conditionally use Dev Certificate
1 parent 4516435 commit a63649a

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.github/actions/xcbuild/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ runs:
6969
security unlock-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN
7070
7171
- name: Add Apple Development certificate to Keychain
72+
if: inputs.APPLE_DEVELOPMENT_SIGNING_CERTIFICATE != ""
7273
uses: ./.github/actions/install-cert
7374
with:
7475
SIGNING_CERTIFICATE: ${{ inputs.APPLE_DEVELOPMENT_SIGNING_CERTIFICATE }}

.github/workflows/ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ on:
2121
push:
2222

2323
env:
24-
KEYCHAIN: ""
2524
KEYCHAIN_PASSWORD: mysecretpassword
2625
KEYCHAIN_PROFILE: build-profile
2726
SSH_KEY: /tmp/id_rsa
2827
APPLE_STORE_AUTH_KEY_PATH: /tmp/authkey.p8
2928
APPLE_AUTH_PARAMS: "-authenticationKeyPath /tmp/authkey.p8 -authenticationKeyID ${{ secrets.APPLE_STORE_AUTH_KEY_ID }} -authenticationKeyIssuerID ${{ secrets.APPLE_STORE_AUTH_KEY_ISSUER_ID }}"
3029
# conditionally updated later:
30+
KEYCHAIN: ""
31+
DEV_CERTIFICATE: ""
3132
EXPORT_METHOD: "app-store"
3233
EXTRA_XCODEBUILD: ""
3334
UPLOAD_TO: "" # !important this filters down the matrix combinations
@@ -132,6 +133,11 @@ jobs:
132133
echo "SIGNING_CERTIFICATE=${{ secrets.APPLE_DEVELOPER_ID_SIGNING_CERTIFICATE }}" >> $GITHUB_ENV
133134
echo "SIGNING_CERTIFICATE_P12_PASSWORD=${{ secrets.APPLE_DEVELOPER_ID_SIGNING_P12_PASSWORD }}" >> $GITHUB_ENV
134135
136+
137+
- name: Enable Development Cert for everything apart from macOS FTP
138+
if: matrix.platform != 'macOS' || matrix.destination != 'ftp'
139+
run: echo "DEV_CERTIFICATE=${{ secrets.APPLE_DEVELOPER_ID_SIGNING_CERTIFICATE}}" >> &GITHUB_ENV
140+
135141
- name: Use Apple Development Certificate
136142
if: matrix.platform == 'iOS' && matrix.destination == 'ftp' && contains(env.UPLOAD_TO, matrix.destination)
137143
run: |
@@ -154,7 +160,7 @@ jobs:
154160
action: archive
155161
xc-destination: generic/platform=${{ matrix.platform }}
156162
version: ${{ env.VERSION }}
157-
APPLE_DEVELOPMENT_SIGNING_CERTIFICATE: ${{ secrets.APPLE_DEVELOPMENT_SIGNING_CERTIFICATE }}
163+
APPLE_DEVELOPMENT_SIGNING_CERTIFICATE: ${{ env.DEV_CERTIFICATE }}
158164
APPLE_DEVELOPMENT_SIGNING_P12_PASSWORD: ${{ secrets.APPLE_DEVELOPMENT_SIGNING_P12_PASSWORD }}
159165
DEPLOYMENT_SIGNING_CERTIFICATE: ${{ env.SIGNING_CERTIFICATE }}
160166
DEPLOYMENT_SIGNING_CERTIFICATE_P12_PASSWORD: ${{ env.SIGNING_CERTIFICATE_P12_PASSWORD }}

0 commit comments

Comments
 (0)