From 40df4a54411ae9e02f617e0b0565aabfb6cbc029 Mon Sep 17 00:00:00 2001
From: Yangshun Tay <tay.yang.shun@gmail.com>
Date: Wed, 19 Sep 2018 22:52:51 +0800
Subject: [PATCH 1/2] Update CI for v2

---
 .circleci/config.yml | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ab691f43f61b..a9f4fbad9ce1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -94,24 +94,7 @@ jobs:
           command: cd v1 && yarn test
       - run:
           name: Test Static Website Builds
-          command: cd v1/website && yarn run build
-
-  v2-tests:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore-cache: *v2-restore-yarn-cache
-      - run: *v2-yarn
-      - save-cache: *v2-save-yarn-cache
-      - run:
-          name: Check ESLint
-          command: cd v2 && yarn lint
-      - run:
-          name: Run Test Suites
-          command: cd v2 && yarn test
-      - run:
-          name: Test Static Website Builds
-          command: cd v2/website && yarn run build
+          command: cd v1/website && yarn build
 
   # The CIRCLE_ variables are defined during the CircleCI build process
   # https://circleci.com/docs/1.0/environment-variables/
@@ -154,6 +137,23 @@ jobs:
               echo "Skipping deploy."
             fi
 
+  v2-tests:
+    <<: *defaults
+    steps:
+      - checkout
+      - restore-cache: *v2-restore-yarn-cache
+      - run: *v2-yarn
+      - save-cache: *v2-save-yarn-cache
+      - run:
+          name: Check ESLint
+          command: cd v2 && yarn lint
+      - run:
+          name: Run Test Suites
+          command: cd v2 && yarn test
+      - run:
+          name: Test Static Website Builds
+          command: cd v2/website && yarn build
+
   publish-npm:
     <<: *defaults
     steps:
@@ -189,6 +189,11 @@ workflows:
             - v1-tests
           filters: *filter-only-master
 
+  v1:
+    jobs:
+      - v2-tests:
+          filters: *filter-ignore-gh-pages
+
   deploy:
     jobs:
       - hold:

From 0b3d0d8f886c30fca498f8e6aa3910cebf767012 Mon Sep 17 00:00:00 2001
From: Yangshun Tay <tay.yang.shun@gmail.com>
Date: Wed, 19 Sep 2018 22:55:27 +0800
Subject: [PATCH 2/2] Fix workflow name

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a9f4fbad9ce1..d50d3a607da5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -189,7 +189,7 @@ workflows:
             - v1-tests
           filters: *filter-only-master
 
-  v1:
+  v2:
     jobs:
       - v2-tests:
           filters: *filter-ignore-gh-pages