From c8d9758f181ce566102208fb5d43920733e5d101 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Fri, 6 Jan 2023 21:41:03 +0200
Subject: [PATCH] CI fixes (#6936)

* CI fixes

* Fix fastlane script
---
 .circleci/config.yml |  2 +-
 fastlane/Fastfile    | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0c57d7508f..e3720cee60 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,7 +39,7 @@ commands:
     steps:
       - add_ssh_keys:
           fingerprints:
-            - "59:4d:99:5e:1c:6d:30:36:6d:60:76:88:ff:a7:ab:63"
+            - "03:1c:a7:07:35:bc:57:e4:1d:6c:e1:2c:4b:be:09:6d"
       - run:
           name: Clone the mobile private repo
           command: git clone git@github.com:mattermost/mattermost-mobile-private.git ~/mattermost-mobile-private
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 7e281fb267..63a4161ab0 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -323,7 +323,7 @@ platform :ios do
 
   desc 'Get iOS match profiles'
   lane :certs do
-    if !ENV['MATCH_PASSWORD'].nil? && !ENV['MATCH_PASSWORD'].empty?
+    if !ENV['IOS_API_KEY_ID'].nil? && !ENV['IOS_API_KEY_ID'].empty?
       api_key = get_apple_api_key()
       match(
           api_key: api_key,
@@ -499,8 +499,17 @@ platform :ios do
     )
 
     # Sync the provisioning profiles using match
-    if ENV['SYNC_PROVISIONING_PROFILES'] == 'true' && !ENV['MATCH_PASSWORD'].nil? && !ENV['MATCH_PASSWORD'].empty?
-      match(type: ENV['MATCH_TYPE'] || 'adhoc')
+    if ENV['SYNC_PROVISIONING_PROFILES'] == 'true'
+      if !ENV['MATCH_PASSWORD'].nil? && !ENV['MATCH_PASSWORD'].empty?
+        match(type: ENV['MATCH_TYPE'] || 'adhoc')
+      end
+      if !ENV['IOS_API_KEY_ID'].nil? && !ENV['IOS_API_KEY_ID'].empty?
+        api_key = get_apple_api_key()
+        match(
+            api_key: api_key,
+            type: ENV['MATCH_TYPE'] || 'adhoc'
+        )
+      end
     end
   end