From a13ed5e65abefe4573f246cd46de8638b967741f Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 12:38:28 -0800
Subject: [PATCH] ci - introduce circle ci 2.0

---
 .circleci/config.yml | 52 ++++++++++++++++++++++++++++++++++++++++++++
 circle.yml           | 17 ---------------
 2 files changed, 52 insertions(+), 17 deletions(-)
 create mode 100644 .circleci/config.yml
 delete mode 100644 circle.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..588b2968c
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,52 @@
+ version: 2
+jobs:
+  build:
+    # working_directory: ~/mern-starter
+    # The primary container is an instance of the first list image listed. Your build commands run in this container.
+    docker:
+      - image: circleci/node:8-browsers
+    # # The secondary container is an instance of the second listed image which is run in a common network where ports exposed on the primary container are available on localhost.
+    #   - image: mongo:3.4.4
+    steps:
+      - checkout
+      - run:
+          name: Update npm
+          command: 'sudo npm install -g npm@latest'
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+      - run:
+          name: Install npm
+          command: npm install
+      - save_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+  test:
+    docker:
+      - image: circleci/node:8-browsers
+    steps:
+      - checkout
+      - run:
+          name: Test
+          command: npm test
+      # - run:
+      #     name: Generate code coverage
+      #     command: './node_modules/.bin/nyc report --reporter=text-lcov'
+      # - store_artifacts:
+      #     path: test-results.xml
+      #     prefix: tests
+      # - store_artifacts:
+      #     path: coverage
+      #     prefix: coverage
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build
+      - test:
+          requires:
+            - build
+          filters:
+            branches:
+              only: master
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 6aba5c1be..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-machine:
-  node:
-    version: 8.1.4
-test:
-  override:
-    - "npm test"
-dependencies:
-  pre:
-    - sudo apt-get update
-    # get latest stable firefox
-    - sudo apt-get install firefox
-    - firefox_cmd=`which firefox`; sudo rm -f $firefox_cmd; sudo ln -s `which firefox.ubuntu` $firefox_cmd
-    # get latest stable chrome
-    - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-    - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-    - sudo apt-get update
-    - sudo apt-get install google-chrome-stable
\ No newline at end of file