From cd6bac542d8881d713a41a3d9b9fd9c942bd3955 Mon Sep 17 00:00:00 2001
From: Martin Walsh <martin.walsh@gmail.com>
Date: Tue, 10 Jul 2018 14:20:26 +0100
Subject: [PATCH 1/2] Added CI 2.0

---
 .circleci/config.yml | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..57c761217
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,39 @@
+version: 2
+jobs:
+  build-and-test:
+    docker:
+      - image: circleci/node:6.14.3-browsers
+    environment:
+          LANG: en_US.UTF-8
+    steps:
+      - checkout
+      - run: 
+          name: Update Yarn
+          command: 'sudo npm update -g yarn'
+      - restore-cache:
+          name: Restore Yarn Package Cache
+          keys: 
+            - yarn-packages-{{ checksum "yarn.lock" }}
+      - run:
+          name: Install Dependencies
+          command: yarn install --pure-lockfile
+      - save-cache:
+          name: Save Yarn Package Cache
+          key: yarn-packages-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache/yarn
+      - run: 
+          name: Check
+          command: yarn check
+      - run: 
+          name: Tests
+          command: yarn test:ci
+      - run: 
+          name: Generate Coverage
+          command: yarn test:coverage
+
+workflows:
+  version: 2
+  build-test-report:
+    jobs:
+      - build-and-test
\ No newline at end of file

From 5c9892ed2d40b3835d3beb25662eabf48e29aba5 Mon Sep 17 00:00:00 2001
From: Martin Walsh <martin.walsh@gmail.com>
Date: Tue, 10 Jul 2018 15:00:08 +0100
Subject: [PATCH 2/2] Remove legacy CI

---
 .travis.yml |  3 ---
 circle.yml  | 16 ----------------
 2 files changed, 19 deletions(-)
 delete mode 100644 .travis.yml
 delete mode 100644 circle.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a3bad48c1..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-language: node_js
-node_js:
-- 0.10
\ No newline at end of file
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index ed9e2f5a7..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-machine:
-  node:
-    version: v6.10.0
-  environment:
-    PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
-dependencies:
-  override:
-    - yarn install --pure-lockfile
-  cache_directories:
-    - ~/.cache/yarn
-test:
-  override:
-    - yarn check
-    - yarn test:ci
-  post:
-    - yarn test:coverage
\ No newline at end of file