From c243090fdcd5b121a13e6022a8754d741b32f74c Mon Sep 17 00:00:00 2001
From: Robbie Trencheny <me@robbiet.us>
Date: Thu, 16 Nov 2017 17:34:46 -0800
Subject: [PATCH] Fix order of operations on fastlane

---
 fastlane/Fastfile | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index e43071c26..c76f40e51 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -152,15 +152,6 @@ platform :ios do
 
   desc "Runs build when on Travis"
   lane :ci do
-    slack(message: "Beginning Travis CI build")
-    create_keychain(
-      name: ENV["MATCH_KEYCHAIN_NAME"],
-      password: ENV["MATCH_PASSWORD"],
-      timeout: 3600,
-      default_keychain: true,
-    )
-
-    sh("security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k #{ENV["HOMEASSISTANT_CERTIFICATE_KEY"]} #{ENV["MATCH_KEYCHAIN_NAME"]}")
     if is_ci && ENV["TRAVIS_PULL_REQUEST"] == "false" && git_branch == "master"
       ENV["FASTLANE_PASSWORD"] = ENV["HOMEASSISTANT_ITUNES_PASSWORD"]
 
@@ -173,6 +164,17 @@ platform :ios do
             readonly: true,
             keychain_name: ENV["MATCH_KEYCHAIN_NAME"],
             keychain_password: ENV["MATCH_PASSWORD"])
+
+      slack(message: "Beginning Travis CI build")
+      create_keychain(
+        name: ENV["MATCH_KEYCHAIN_NAME"],
+        password: ENV["MATCH_PASSWORD"],
+        timeout: 3600,
+        default_keychain: true,
+      )
+
+      sh("security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k #{ENV["HOMEASSISTANT_CERTIFICATE_KEY"]} #{ENV["MATCH_KEYCHAIN_NAME"]}")
+
       itunes
     end
   end