x

Signed-off-by: Jakub Sokołowski <[email protected]>

Author: jakubgs

fastlane/Fastfile

@@ -59,7 +59,7 @@ class Keychain
     # Local devs will not have KEYCHAIN_PASSWORD set, and will be prompted for password.
     return "login.keychain-db" unless ENV['KEYCHAIN_PASSWORD']
     # We user the same keychain every time because we need to set a default.
-    @name = "#{name}.keychain-db"
+    @name = "#{name}-TEST.keychain-db"
     @pass = ENV['KEYCHAIN_PASSWORD']
     Fastlane::Actions::CreateKeychainAction.run(
       name: @name,
@@ -68,14 +68,12 @@ class Keychain
       # Fastlane can't find the signing cert without setting a default.
       default_keychain: true,
       # Deleting the keychain would cause race condition for parallel jobs.
-      require_create: false,
+      require_create: true,
       # Lock it up after 25 minutes just in case we don't delete it.
       lock_when_sleeps: true,
       lock_after_timeout: true,
       timeout: 1500
     )
-    # Fix certificate access permissions
-    Fastlane::Actions.sh("security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k #{pass} #{@name}")
   end
 end
 
@@ -108,6 +106,13 @@ def build_ios_adhoc(readonly: false, pr_build: false)
 
   kc = Keychain.new('fastlane')
 
+  # recreate keychain
+  sh("security delete-keychain #{kc.name}", error_callback: ->(result) { })
+  sh("security create-keychain -p #{kc.pass} #{kc.name}")
+  sh("security set-keychain-settings -t 3600 -l #{kc.name}")
+  sh("security unlock-keychain -p #{kc.pass} #{kc.name}")
+  sh("security list-keychains -d user -s login.keychain #{kc.name}")
+
   match(
     type: 'adhoc',
     readonly: readonly,
@@ -118,6 +123,12 @@ def build_ios_adhoc(readonly: false, pr_build: false)
     keychain_password: kc.pass
   )
 
+  # Fix certificate access permissions
+  sh("security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k #{kc.pass} #{kc.name}")
+
+  # Debug
+  sh("security find-identity -v -p codesigning #{kc.name}")
+
   build_ios_app(
     scheme: scheme,
     workspace: 'ios/StatusIm.xcworkspace',
@@ -217,6 +228,13 @@ platform :ios do
   lane :release do
     kc = Keychain.new('fastlane')
 
+    # recreate keychain
+    sh("security delete-keychain #{kc.name}", error_callback: ->(result) { })
+    sh("security create-keychain -p #{kc.pass} #{kc.name}")
+    sh("security set-keychain-settings -t 3600 -l #{kc.name}")
+    sh("security unlock-keychain -p #{kc.pass} #{kc.name}")
+    sh("security list-keychains -d user -s login.keychain #{kc.name}")
+
     match(
       type: 'appstore',
       readonly: true,
@@ -226,6 +244,12 @@ platform :ios do
       keychain_password: kc.pass
     )
 
+    # Fix certificate access permissions
+    sh("security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k #{kc.pass} #{kc.name}")
+
+    # Debug
+    sh("security find-identity -v -p codesigning #{kc.name}")
+
     build_ios_app(
       scheme: 'StatusIm',
       workspace: 'ios/StatusIm.xcworkspace',