Use separate keychain files

kiwix · Jan 6, 2025 · 7b802e3 · 7b802e3
1 parent 48293a7
commit 7b802e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.github/actions/xcbuild/action.yml b/.github/actions/xcbuild/action.yml
@@ -20,14 +20,10 @@ inputs:
   DEPLOYMENT_SIGNING_CERTIFICATE_P12_PASSWORD:
     required: false
   KEYCHAIN:
-    required: false
-    default: /Users/runner/build.keychain-db
+    required: true
   KEYCHAIN_PASSWORD:
     required: false
     default: mysecretpassword
-  KEYCHAIN_PROFILE:
-    required: false
-    default: build-profile
   XC_WORKSPACE:
     required: false
     default: Kiwix.xcodeproj/project.xcworkspace/

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ on:
   push:
 
 env:
-  KEYCHAIN: /Users/runner/build.keychain-db
+  KEYCHAIN: ""
   KEYCHAIN_PASSWORD: mysecretpassword
   KEYCHAIN_PROFILE: build-profile
   SSH_KEY: /tmp/id_rsa
@@ -56,6 +56,9 @@ jobs:
     - name: Install python dependencies
       run: pip install pyyaml==6.0.1
 
+    - name: Set KEYCHAIN value
+      run: echo 'KEYCHAIN="/Users/runner/build-${matrix.platform}-${matrix.destination}.keychain-db"' >> $GITHUB_ENV
+
     - name: Set VERSION from code
       shell: python
       run: |
@@ -156,7 +159,6 @@ jobs:
         DEPLOYMENT_SIGNING_CERTIFICATE_P12_PASSWORD: ${{ env.SIGNING_CERTIFICATE_P12_PASSWORD }}
         KEYCHAIN: ${{ env.KEYCHAIN }}
         KEYCHAIN_PASSWORD: ${{ env.KEYCHAIN_PASSWORD }}
-        KEYCHAIN_PROFILE: ${{ env.KEYCHAIN_PROFILE }}
         EXTRA_XCODEBUILD: ${{ env.EXTRA_XCODEBUILD }}
 
     - name: Add altool credentials to Keychain