From db7cdf020021d0877bbf4332cd4c501b3bf74ca4 Mon Sep 17 00:00:00 2001
From: calebboyd <caleb.boyd@gmail.com>
Date: Tue, 31 Jul 2018 11:43:36 -0500
Subject: [PATCH] chore(ci): fix automated mac builds

---
 .circleci/build.sh                   |  8 ++++++++
 .circleci/config.yml                 | 12 ++++++------
 .circleci/{bootstrap.sh => setup.sh} | 13 ++-----------
 .circleci/test.sh                    | 11 -----------
 4 files changed, 16 insertions(+), 28 deletions(-)
 create mode 100755 .circleci/build.sh
 rename .circleci/{bootstrap.sh => setup.sh} (52%)
 delete mode 100755 .circleci/test.sh

diff --git a/.circleci/build.sh b/.circleci/build.sh
new file mode 100755
index 0000000..af19e8b
--- /dev/null
+++ b/.circleci/build.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+export NVS_HOME="$HOME/.nvs"
+. "$NVS_HOME/nvs.sh" install && nvs link lts && nvs use default
+
+set -e -x
+
+yarn run asset-compile
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5748879..d178627 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2
 
 jobs:
-  test:
+  build:
     macos:
       xcode: "9.0"
     steps:
@@ -11,18 +11,18 @@ jobs:
         - package-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
         - package- # Fallback for the latest package.json cache
     - run:
-        name: configure-yarn
-        command: .circleci/bootstrap.sh
+        name: setup
+        command: .circleci/setup.sh
     - save_cache:
         key: package-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }} 
         paths:
         - node_modules
     - run:
-        name: test
-        command: .circleci/test.sh
+        name: build
+        command: .circleci/build.sh
 
 workflows:
   version: 2
   test:
     jobs:
-      - test
+      - build
diff --git a/.circleci/bootstrap.sh b/.circleci/setup.sh
similarity index 52%
rename from .circleci/bootstrap.sh
rename to .circleci/setup.sh
index d840500..1797b2c 100755
--- a/.circleci/bootstrap.sh
+++ b/.circleci/setup.sh
@@ -6,15 +6,6 @@ echo "setting up node to use latest lts"
 export NVS_HOME="$HOME/.nvs"
 git clone --depth=1 https://github.com/jasongin/nvs "$NVS_HOME"
 . "$NVS_HOME/nvs.sh" install
-nvs add lts
-nvs link lts
-nvs use default
-echo "using node $(node --version)"
-
-# Install latest yarn version
-npm install -g yarn
-
-echo "using yarn $(yarn --version)"
-
-# Run yarn
+nvs add lts && nvs link lts nvs use default
+npm install -g yarn 
 yarn
diff --git a/.circleci/test.sh b/.circleci/test.sh
deleted file mode 100755
index 9c9e6b6..0000000
--- a/.circleci/test.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#1/usr/bin/env bash
-
-export NVS_HOME="$HOME/.nvs"
-. "$NVS_HOME/nvs.sh" install
-
-nvs link lts
-nvs use default
-
-set -e -x
-
-yarn run asset-compile