From 3f37ec011b6f07fe477186df50ea4144c83d81e4 Mon Sep 17 00:00:00 2001
From: Marcus Cobden <marcus@weave.works>
Date: Wed, 26 Sep 2018 10:54:24 +0100
Subject: [PATCH] Also cache the client/node_modules

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f5f11e2c8..c899fa7bb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -63,13 +63,23 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          keys:
-          - yarn-cache-{{ checksum "client/yarn.lock" }}
+          name: Restoring Yarn Cache
+          key: yarn-cache-{{ checksum "client/yarn.lock" }}
+      - restore_cache:
+          name: Restoring client/node_modules
+          key: node-modules-{{ checksum "client/yarn.lock" }}-{{ checksum ".circleci/config.yml" }}
       - run: cd client; yarn install
       - save_cache:
+          name: Saving Yarn Cache
           key: yarn-cache-{{ checksum "client/yarn.lock" }}
           paths:
             - "/home/weave/scope/.cache/yarn"
+      - save_cache:
+          name: Saving client/node_modules
+          # include the CI config in the checksum because it will change when the docker image changes
+          key: node-modules-{{ checksum "client/yarn.lock" }}-{{ checksum ".circleci/config.yml" }}
+          paths:
+            - "/home/weave/scope/client/node_modules"
       - run: |
           cd client
           yarn run build
@@ -88,8 +98,11 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          keys:
-          - yarn-cache-{{ checksum "client/yarn.lock" }}
+          name: Restoring Yarn Cache
+          key: yarn-cache-{{ checksum "client/yarn.lock" }}
+      - restore_cache:
+          name: Restoring client/node_modules
+          key: node-modules-{{ checksum "client/yarn.lock" }}-{{ checksum ".circleci/config.yml" }}
       - run: |
           cd client
           yarn install