Update ios.yml

xivilay · Jan 6, 2024 · f842e27 · f842e27
1 parent 68fa64a
commit f842e27
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -6,6 +6,16 @@ on:
 env:
   BUILD_TYPE: Release
   PROJECT_NAME: ScaleRemapper
+
+  APPLE_P12_CERT_BASE64: ${{ secrets.APPLE_P12_CERT_BASE64 }}
+  APPLE_P12_PASSWORD: ${{ secrets.APPLE_P12_PASSWORD }}
+  APPLE_PROVISION_PROFILE_BASE64: ${{ secrets.APPLE_PROVISION_PROFILE_BASE64 }}
+  APPLE_KEYCHAIN_PASSWORD: ${{ secrets.APPLE_KEYCHAIN_PASSWORD }}
+
+  CERTIFICATE_PATH: $RUNNER_TEMP/build_certificate.p12
+  TMP_CERT_PATH: signingCertificate.p12
+  PP_PATH: $RUNNER_TEMP/build_pp.mobileprovision
+  KEYCHAIN_PATH: $RUNNER_TEMP/app-signing.keychain-db
 
 jobs:
   build:
@@ -21,29 +31,19 @@ jobs:
           token: ${{secrets.GH_PAT}}
           submodules: 'recursive'
 
-      - name: Install the Apple certificate and provisioning profile
-        env:
-          APPLE_P12_CERT_BASE64: ${{ secrets.APPLE_P12_CERT_BASE64 }}
-          APPLE_P12_PASSWORD: ${{ secrets.APPLE_P12_PASSWORD }}
-          APPLE_PROVISION_PROFILE_BASE64: ${{ secrets.APPLE_PROVISION_PROFILE_BASE64 }}
-          APPLE_KEYCHAIN_PASSWORD: ${{ secrets.APPLE_KEYCHAIN_PASSWORD }}
+      - name: Apple signing setup - Step 1 (create temporary keychain)
         run: |
-          # create variables
-          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          TMP_CERT_PATH=signingCertificate.p12
-          PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
-          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-          
-          # create temporary keychain
           security create-keychain -p "$APPLE_KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
           security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
           security unlock-keychain -p "$APPLE_KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
 
-          # import certificate and provisioning profile from secrets
+      - name: Apple signing setup - Step 2 (import certificate and provisioning profile from secrets)
+        run: |
           # echo -n "$APPLE_P12_CERT_BASE64" | base64 --decode -o $CERTIFICATE_PATH
           # echo -n "$APPLE_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH
 
-          # import certificate to keychain
+      - name: Apple signing setup - Step 3 (import certificate to keychain)
+        run: |
           echo $APPLE_P12_CERT_BASE64 | base64 --decode > $TMP_CERT_PATH
           security import $TMP_CERT_PATH \
                           -f pkcs12 \
@@ -54,7 +54,8 @@ jobs:
           # security import $CERTIFICATE_PATH -f pkcs12 -k $KEYCHAIN_PATH -P "$APPLE_P12_PASSWORD" -A -t cert 
           security list-keychain -d user -s $KEYCHAIN_PATH
 
-          # apply provisioning profile
+      - name: Apple signing setup - Step 4 (apply provisioning profile)
+        run: |
           mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
           # cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles