From 235f26e7fd7df43048d60cb8a5c8d7d5e51d369f Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Tue, 4 Aug 2020 00:08:01 +0800
Subject: [PATCH] fix folder for build (#4634)

---
 .circleci/config.yml | 35 +++++++++++++++++++++++++++++++++++
 fastlane/Fastfile    |  4 ++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 492221d33..ccb055f4f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -368,6 +368,31 @@ jobs:
       - save:
           filename: "Mattermost-unsigned.ipa"
 
+  build-ios-simulator:
+    executor: ios
+    steps:
+      - checkout:
+          path: ~/mattermost-mobile
+      - ruby-setup
+      - npm-dependencies
+      - pods-dependencies
+      - assets
+      - fastlane-dependencies:
+          for: ios
+      - run:
+          working_directory: fastlane
+          name: Run fastlane to build unsigned x86_64 iOS app for iPhone simulator
+          no_output_timeout: 30m
+          command: |
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install watchman
+            bundle exec fastlane ios simulator
+      - persist_to_workspace:
+          root: ~/
+          paths:
+            - mattermost-mobile/Mattermost-simulator-x86_64.app.zip
+      - save:
+          filename: "Mattermost-simulator-x86_64.app.zip"
+
   deploy-android-release:
     executor:
       name: android
@@ -548,6 +573,16 @@ workflows:
               only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
             branches:
               only: unsigned
+      - build-ios-simulator:
+          context: mattermost-mobile-unsigned
+          requires:
+            - test
+          filters:
+            branches:
+              only:
+                - /^build-\d+$/
+                - /^build-ios-\d+$/
+                - /^build-ios-beta-\d+$/
                 
       - github-release:
           context: mattermost-mobile-unsigned
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 01806be17..b50475c4b 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -358,8 +358,8 @@ platform :ios do
     replace_assets
 
     sh 'cd ../ios && xcodebuild -workspace Mattermost.xcworkspace -scheme Mattermost -arch x86_64 -sdk iphonesimulator -configuration Release -parallelizeTargets -derivedDataPath ../build-ios ENABLE_BITCODE=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ENABLE_BITCODE=NO'
-    sh 'cd ../ios/Build/Products/Release-iphonesimulator && zip -r Mattermost-simulator-x86_64.app.zip Mattermost.app'
-    sh 'mv ../ios/Build/Products/Release-iphonesimulator/Mattermost-simulator-x86_64.app.zip ../'
+    sh 'cd ../build-ios/Build/Products/Release-iphonesimulator && zip -r Mattermost-simulator-x86_64.app.zip Mattermost.app'
+    sh 'mv ../build-ios/Build/Products/Release-iphonesimulator/Mattermost-simulator-x86_64.app.zip ../'
     upload_file_to_s3({
       :os_type => "iOS",
       :file => "Mattermost-simulator-x86_64.app.zip"