From 3fc5c53b30253b2c20e3c3060673edf7c08e3e29 Mon Sep 17 00:00:00 2001
From: Mark Nevill <mark.nevill@sensat.co.uk>
Date: Fri, 4 Feb 2022 09:37:56 +0000
Subject: [PATCH] feat: Skip Detox setup in ios_build job

---
 src/commands/setup_macos_executor.yml | 55 +++++++++++++++++++++------
 src/jobs/ios_build.yml                |  4 +-
 src/jobs/ios_build_and_test.yml       |  1 +
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/commands/setup_macos_executor.yml b/src/commands/setup_macos_executor.yml
index 96ee6ae..dfbc272 100644
--- a/src/commands/setup_macos_executor.yml
+++ b/src/commands/setup_macos_executor.yml
@@ -13,6 +13,14 @@ parameters:
     description: Should we run brew update? Defaults to true
     type: boolean
     default: true
+  android:
+    description: Should we set up the Android build environment? Defaults to true
+    type: boolean
+    default: true
+  detox:
+    description: Should we set up Detox? Defaults to true
+    type: boolean
+    default: true
 
 steps:
   - run:
@@ -27,7 +35,12 @@ steps:
         source $BASH_ENV
 
   - when:
-      condition: <<parameters.homebrew_cache>>
+      condition:
+        and:
+          - <<parameters.homebrew_cache>>
+          - or:
+              - <<parameters.android>>
+              - <<parameters.detox>>
       steps:
         - restore_cache:
             key: |
@@ -50,24 +63,42 @@ steps:
       command: node --version
 
   - when:
-      condition: <<parameters.homebrew_update>>
+      condition:
+        and:
+          - <<parameters.homebrew_update>>
+          - or:
+              - <<parameters.android>>
+              - <<parameters.detox>>
       steps:
         - run:
             name: Update brew
             command: brew update >/dev/null
 
-  - run:
-      name: Configure Detox Environment
-      command: |
-        HOMEBREW_NO_AUTO_UPDATE=1 brew tap wix/brew >/dev/null
-        HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/cask >/dev/null
-        HOMEBREW_NO_AUTO_UPDATE=1 brew install applesimutils >/dev/null
-        HOMEBREW_NO_AUTO_UPDATE=1 brew install android-commandlinetools >/dev/null
-        touch .watchmanconfig
-        node -v
+  - when:
+      condition: <<parameters.android>>
+      steps:
+        run:
+          name: Configure Android Build Environment
+          command: |
+            HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/cask >/dev/null
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install android-commandlinetools >/dev/null
+
+  - when:
+      condition: <<parameters.detox>>
+      steps:
+        run:
+          name: Configure Detox Environment
+          command: |
+            HOMEBREW_NO_AUTO_UPDATE=1 brew tap wix/brew >/dev/null
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install applesimutils >/dev/null
 
   - when:
-      condition: <<parameters.homebrew_cache>>
+      condition:
+        and:
+          - <<parameters.homebrew_cache>>
+          - or:
+              - <<parameters.android>>
+              - <<parameters.detox>>
       steps:
         - save_cache:
             paths:
diff --git a/src/jobs/ios_build.yml b/src/jobs/ios_build.yml
index 1dbf06c..ec03123 100644
--- a/src/jobs/ios_build.yml
+++ b/src/jobs/ios_build.yml
@@ -86,8 +86,8 @@ steps:
             at: <<parameters.workspace_root>>
   - setup_macos_executor:
       node_version: <<parameters.node_version>>
-      homebrew_cache: <<parameters.homebrew_cache>>
-      homebrew_update: <<parameters.homebrew_update>>
+      android: false
+      detox: false
   - yarn_install:
       cache: <<parameters.yarn_cache>>
       cache_folder: <<parameters.yarn_cache_folder>>
diff --git a/src/jobs/ios_build_and_test.yml b/src/jobs/ios_build_and_test.yml
index afe2f75..1ada937 100644
--- a/src/jobs/ios_build_and_test.yml
+++ b/src/jobs/ios_build_and_test.yml
@@ -104,6 +104,7 @@ steps:
             at: <<parameters.workspace_root>>
   - setup_macos_executor:
       node_version: <<parameters.node_version>>
+      android: false
       homebrew_cache: <<parameters.homebrew_cache>>
       homebrew_update: <<parameters.homebrew_update>>
   - ios_simulator_start: