From ffddf39b2c45eb24ec0a6306b03b5ee0b5bf6a13 Mon Sep 17 00:00:00 2001
From: Anon Ray <rayanon004@gmail.com>
Date: Wed, 20 Mar 2019 12:17:40 +0530
Subject: [PATCH] reduce server build time on ci

  fix caching issues on build server job. reduces server build time.
---
 .circleci/config.yml | 23 +++++++----------------
 server/Makefile      |  1 +
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 56b781fea5dd9..b3951a3689283 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -96,15 +96,12 @@ refs:
     - checkout
     - restore_cache:
         keys:
-        - server-app-cache-{{ .Branch }}-{{ .Revision }}
-    - restore_cache:
-        keys:
-        - server-deps-cache-{{ checksum "server/graphql-engine.cabal" }}-{{ checksum "server/stack.yaml" }}
+        - server-cache-v1-{{ checksum "server/graphql-engine.cabal" }}-{{ checksum "server/stack.yaml" }}
     - *wait_for_postgres
     - run:
-        name: Install deps
-        # if the man directories are missing, postgresql-client fails
-        # to install in debian
+        name: Install test dependencies
+        # if the man directories are missing, postgresql-client fails to
+        # install in debian
         command: |
           mkdir -p /usr/share/man/man{1,7}
           apt-get update
@@ -158,10 +155,7 @@ jobs:
     - *setup_remote_docker
     - restore_cache:
         keys:
-        - server-deps-cache-{{ checksum "server/graphql-engine.cabal" }}-{{ checksum "server/stack.yaml" }}
-    - restore_cache:
-        keys:
-        - server-app-cache-{{ .Branch }}-{{ .Revision }}
+        - server-cache-v1-{{ checksum "server/graphql-engine.cabal" }}-{{ checksum "server/stack.yaml" }}
     - run:
         name: Build the server
         working_directory: ./server
@@ -177,13 +171,10 @@ jobs:
           make ci-image
           make ci-save-image
     - save_cache:
-        key: server-app-cache-{{ .Branch }}-{{ .Revision }}
-        paths:
-        - ./server/.stack-work
-    - save_cache:
-        key: server-deps-cache-{{ checksum "server/graphql-engine.cabal" }}-{{ checksum "server/stack.yaml" }}
+        key: server-cache-v1-{{ checksum "server/graphql-engine.cabal" }}-{{ checksum "server/stack.yaml" }}
         paths:
         - ~/.stack
+        - ./server/.stack-work
     - store_artifacts:
         path: /build/_server_output
         destination: server
diff --git a/server/Makefile b/server/Makefile
index e07938e58eb5d..77543d4754d99 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -33,6 +33,7 @@ release-image: $(project).cabal
 
 # assumes this is built in circleci
 ci-binary:
+	stack clean
 	mkdir -p packaging/build/rootfs
 	stack $(STACK_FLAGS) build $(BUILD_FLAGS)
 	mkdir -p $(build_output)