From bb6e438896f0d4deb4ae2311d9ac8ef1d2f41554 Mon Sep 17 00:00:00 2001
From: Chris Lewis <clewis@palantir.com>
Date: Mon, 18 Dec 2017 15:24:52 -0800
Subject: [PATCH 1/3] Apply Circle config.yml changes from
 cl/graduate-labs-to-core-2 branch

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 061477df98..b187f9e7b8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,17 +7,24 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v5-dependency-cache-{{ checksum "yarn.lock" }}
-            - v5-dependency-cache-
+            - v6-dependency-cache-{{ checksum "yarn.lock" }}
+            - v6-dependency-cache-
       - run: yarn
       - run: echo "Checking if lockfiles changed..." && git diff --exit-code
       - run: npm rebuild node-sass
       - save_cache:
-          key: v5-dependency-cache-{{ checksum "yarn.lock" }}
+          key: v6-dependency-cache-{{ checksum "yarn.lock" }}
           paths:
             - ~/yarn
             - ~/.cache/yarn
             - node_modules
+            - packages/core/node_modules
+            - packages/datetime/node_modules
+            - packages/docs/node_modules
+            - packages/labs/node_modules
+            - packages/select/node_modules
+            - packages/table/node_modules
+            - packages/timezone/node_modules
       - persist_to_workspace:
           root: '.'
           paths:
@@ -32,8 +39,8 @@ jobs:
           at: '.'
       - restore_cache:
           keys:
-            - v5-dependency-cache-{{ checksum "yarn.lock" }}
-            - v5-dependency-cache-
+            - v6-dependency-cache-{{ checksum "yarn.lock" }}
+            - v6-dependency-cache-
       - run: yarn compile
       - persist_to_workspace:
           root: '.'
@@ -50,8 +57,8 @@ jobs:
           at: '.'
       - restore_cache:
           keys:
-            - v5-dependency-cache-{{ checksum "yarn.lock" }}
-            - v5-dependency-cache-
+            - v6-dependency-cache-{{ checksum "yarn.lock" }}
+            - v6-dependency-cache-
       - run: yarn lint
 
   dist-libs:
@@ -62,7 +69,7 @@ jobs:
       - attach_workspace:
           at: '.'
       - restore_cache:
-          key: v5-dependency-cache-{{ checksum "yarn.lock" }}
+          key: v6-dependency-cache-{{ checksum "yarn.lock" }}
       - run: yarn dist:libs
       - persist_to_workspace:
           root: '.'
@@ -83,7 +90,7 @@ jobs:
       - attach_workspace:
           at: '.'
       - restore_cache:
-          key: v5-dependency-cache-{{ checksum "yarn.lock" }}
+          key: v6-dependency-cache-{{ checksum "yarn.lock" }}
       - run: yarn dist:apps
       - persist_to_workspace:
           root: '.'
@@ -101,17 +108,17 @@ jobs:
       - attach_workspace:
           at: '.'
       - restore_cache:
-          key: v5-dependency-cache-{{ checksum "yarn.lock" }}
+          key: v6-dependency-cache-{{ checksum "yarn.lock" }}
       - run:
           command: |
               case $CIRCLE_NODE_INDEX in \
-              0) yarn lerna run test --scope '@blueprintjs/core' ;; \
-              1) yarn lerna run test --scope '@blueprintjs/datetime' ;; \
-              2) yarn lerna run test --scope '@blueprintjs/icons' ;; \
-              3) yarn lerna run test --scope '@blueprintjs/labs' ;; \
-              4) yarn lerna run test --scope '@blueprintjs/select' ;; \
-              5) yarn lerna run test --scope '@blueprintjs/table' ;; \
-              6) yarn lerna run test --scope '@blueprintjs/timezone' ;; \
+              0) cd packages/core && yarn test ;; \
+              1) cd packages/datetime && yarn test ;; \
+              2) cd packages/icons && yarn test ;; \
+              3) cd packages/labs && yarn test ;; \
+              4) cd packages/select && yarn test ;; \
+              5) cd packages/table && yarn test ;; \
+              6) cd packages/timezone && yarn test ;; \
               esac
 
   deploy-preview:

From 88c3841bbfd1af07ae1305357afb746c65cd4ee5 Mon Sep 17 00:00:00 2001
From: Chris Lewis <clewis@palantir.com>
Date: Mon, 18 Dec 2017 15:25:00 -0800
Subject: [PATCH 2/3] Add icons package

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b187f9e7b8..f337340731 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,6 +21,7 @@ jobs:
             - packages/core/node_modules
             - packages/datetime/node_modules
             - packages/docs/node_modules
+            - packages/icons/node_modules
             - packages/labs/node_modules
             - packages/select/node_modules
             - packages/table/node_modules

From af2769c45a868801b144112d9faca9188843f5b6 Mon Sep 17 00:00:00 2001
From: Chris Lewis <clewis@palantir.com>
Date: Mon, 18 Dec 2017 15:26:25 -0800
Subject: [PATCH 3/3] Add mocha dev dependency to packages/timezone

---
 packages/timezone/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/timezone/package.json b/packages/timezone/package.json
index f96f54159c..a69183be7b 100644
--- a/packages/timezone/package.json
+++ b/packages/timezone/package.json
@@ -44,6 +44,7 @@
     "enzyme-adapter-react-16": "^1.1.0",
     "es6-shim": "^0.35.3",
     "karma": "^1.7.1",
+    "mocha": "^4.0.1",
     "npm-run-all": "^4.1.1",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",