Remove brew libomp from binary mac machines (#20228)

Summary:
Resolves #20030
Pull Request resolved: #20228

Differential Revision: D15246258

Pulled By: pjh5

fbshipit-source-id: f57033af74b678566be02cdf5700b5ae6e154d4a

.circleci/config.yml

@@ -281,8 +281,6 @@ macos_brew_update: &macos_brew_update
   no_output_timeout: "1h"
   command: |
     set -ex
-    pwd
-    ls -lah
     # moreutils installs a `parallel` executable by default, which conflicts
     # with the executable from the GNU `parallel`, so we must unlink GNU
     # `parallel` first, and relink it afterwards
@@ -293,6 +291,22 @@ macos_brew_update: &macos_brew_update
     brew install expect
     brew install libomp
 
+# In version 2.1 and above we could make this a command and pass a parameter to
+# it, but in this version there is no way to pass a parameter to a step
+binary_macos_brew_update: &binary_macos_brew_update
+  name: Brew update and install moreutils and expect
+  no_output_timeout: "1h"
+  command: |
+    set -ex
+    # moreutils installs a `parallel` executable by default, which conflicts
+    # with the executable from the GNU `parallel`, so we must unlink GNU
+    # `parallel` first, and relink it afterwards
+    brew update
+    brew unlink parallel
+    brew install moreutils
+    brew link parallel --overwrite
+    brew install expect
+
 
 ##############################################################################
 # Linux build defaults
@@ -770,7 +784,7 @@ binary_mac_build: &binary_mac_build
   - run:
       <<: *binary_populate_env
   - run:
-      <<: *macos_brew_update
+      <<: *binary_macos_brew_update
   - run:
       <<: *binary_install_miniconda
 
@@ -805,7 +819,7 @@ binary_mac_upload: &binary_mac_upload
   - run:
       <<: *binary_populate_env
   - run:
-      <<: *macos_brew_update
+      <<: *binary_macos_brew_update
   - run:
       <<: *binary_install_miniconda
   - attach_workspace:
@@ -863,7 +877,7 @@ smoke_mac_test: &smoke_mac_test
     - run:
         <<: *binary_populate_env
     - run:
-        <<: *macos_brew_update
+        <<: *binary_macos_brew_update
     - run:
         name: Build
         no_output_timeout: "1h"

.circleci/verbatim-sources/header-section.yml

@@ -281,8 +281,6 @@ macos_brew_update: &macos_brew_update
   no_output_timeout: "1h"
   command: |
     set -ex
-    pwd
-    ls -lah
     # moreutils installs a `parallel` executable by default, which conflicts
     # with the executable from the GNU `parallel`, so we must unlink GNU
     # `parallel` first, and relink it afterwards
@@ -292,3 +290,19 @@ macos_brew_update: &macos_brew_update
     brew link parallel --overwrite
     brew install expect
     brew install libomp
+
+# In version 2.1 and above we could make this a command and pass a parameter to
+# it, but in this version there is no way to pass a parameter to a step
+binary_macos_brew_update: &binary_macos_brew_update
+  name: Brew update and install moreutils and expect
+  no_output_timeout: "1h"
+  command: |
+    set -ex
+    # moreutils installs a `parallel` executable by default, which conflicts
+    # with the executable from the GNU `parallel`, so we must unlink GNU
+    # `parallel` first, and relink it afterwards
+    brew update
+    brew unlink parallel
+    brew install moreutils
+    brew link parallel --overwrite
+    brew install expect

.circleci/verbatim-sources/macos-binary-build-defaults.yml

@@ -12,7 +12,7 @@ binary_mac_build: &binary_mac_build
   - run:
       <<: *binary_populate_env
   - run:
-      <<: *macos_brew_update
+      <<: *binary_macos_brew_update
   - run:
       <<: *binary_install_miniconda
 
@@ -47,7 +47,7 @@ binary_mac_upload: &binary_mac_upload
   - run:
       <<: *binary_populate_env
   - run:
-      <<: *macos_brew_update
+      <<: *binary_macos_brew_update
   - run:
       <<: *binary_install_miniconda
   - attach_workspace:

.circleci/verbatim-sources/nightly-build-smoke-tests-defaults.yml

@@ -44,7 +44,7 @@ smoke_mac_test: &smoke_mac_test
     - run:
         <<: *binary_populate_env
     - run:
-        <<: *macos_brew_update
+        <<: *binary_macos_brew_update
     - run:
         name: Build
         no_output_timeout: "1h"