From c67e7b3c96950e2dc03bfc78aee7c5ef2ba29b5f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 20 Sep 2019 09:37:44 -0400
Subject: [PATCH 1/4] Disabled mongo tests and installation for Mac builds on
 Travis.

---
 .cicd/build.sh |  7 +++++--
 .travis.yml    | 15 ++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 21cf5ea295..58337d141b 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -2,18 +2,21 @@
 set -eo pipefail
 . ./.cicd/helpers/general.sh
 mkdir -p $BUILD_DIR
-CMAKE_EXTRAS="-DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_BUILD_TYPE='Release'"
+CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE='Release'"
 if [[ "$(uname)" == 'Darwin' ]]; then
     # You can't use chained commands in execute
     if [[ "$TRAVIS" == 'true' ]]; then
         export PINNED=false
         ccache -s
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
-        ./$CICD_DIR/platforms/macos-10.14.sh
+    else
+        CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
     fi
     [[ ! "$PINNED" == 'false' || "$UNPINNED" == 'true' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
     cd $BUILD_DIR
+    echo "cmake $CMAKE_EXTRAS .."
     cmake $CMAKE_EXTRAS ..
+    echo "make -j$JOBS"
     make -j$JOBS
 else # Linux
     ARGS=${ARGS:-"--rm --init -v $(pwd):$MOUNTED_DIR"}
diff --git a/.travis.yml b/.travis.yml
index 915f636b9e..c482fc1618 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,18 +34,19 @@ matrix:
         homebrew:
           update: true
           packages:
-            - graphviz
+            - boost
+            - python@2
+            - python
             - libtool
+            - libusb
+            - graphviz
+            - automake
+            - wget
             - gmp
             - llvm@4
             - pkgconfig
-            - python
-            - python@2
             - doxygen
-            - libusb
-            - openssl
-            - boost@1.70
-            - ccache
+            - openssl            
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
 script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh && if [[ $(uname) != 'Darwin' ]]; then ./.cicd/submodule-regression-check.sh; fi"

From e2d0fd58731b26d45501ad2c2bbd90bd70dec772 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 20 Sep 2019 10:01:22 -0400
Subject: [PATCH 2/4] JQ required for release package test.

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c482fc1618..4ce27f6b47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,8 @@ matrix:
         homebrew:
           update: true
           packages:
+            - ccache
+            - jq
             - boost
             - python@2
             - python
@@ -46,7 +48,7 @@ matrix:
             - llvm@4
             - pkgconfig
             - doxygen
-            - openssl            
+            - openssl
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
 script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh && if [[ $(uname) != 'Darwin' ]]; then ./.cicd/submodule-regression-check.sh; fi"

From b92615c0723deea25188a2262b98609b73df4bf6 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 20 Sep 2019 10:03:21 -0400
Subject: [PATCH 3/4] Ensure mongo flag on all Linux builds.

---
 .cicd/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 58337d141b..8fe4123c50 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -19,6 +19,7 @@ if [[ "$(uname)" == 'Darwin' ]]; then
     echo "make -j$JOBS"
     make -j$JOBS
 else # Linux
+    CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
     ARGS=${ARGS:-"--rm --init -v $(pwd):$MOUNTED_DIR"}
     . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$IMAGE_TAG.dockerfile
     PRE_COMMANDS="cd $MOUNTED_DIR/build"

From 30398d3f44c4fa17115ad6a98ebbf81e12b5d8a6 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 20 Sep 2019 10:53:37 -0400
Subject: [PATCH 4/4] Current test scripts force mongo to run. Must always
 install in Travis for now.

---
 .cicd/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 8fe4123c50..c549a44975 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -9,6 +9,7 @@ if [[ "$(uname)" == 'Darwin' ]]; then
         export PINNED=false
         ccache -s
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
+        ./$CICD_DIR/platforms/macos-10.14.sh
     else
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
     fi