From a13ed5e65abefe4573f246cd46de8638b967741f Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 12:38:28 -0800
Subject: [PATCH 01/18] ci - introduce circle ci 2.0

---
 .circleci/config.yml | 52 ++++++++++++++++++++++++++++++++++++++++++++
 circle.yml           | 17 ---------------
 2 files changed, 52 insertions(+), 17 deletions(-)
 create mode 100644 .circleci/config.yml
 delete mode 100644 circle.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..588b2968c
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,52 @@
+ version: 2
+jobs:
+  build:
+    # working_directory: ~/mern-starter
+    # The primary container is an instance of the first list image listed. Your build commands run in this container.
+    docker:
+      - image: circleci/node:8-browsers
+    # # The secondary container is an instance of the second listed image which is run in a common network where ports exposed on the primary container are available on localhost.
+    #   - image: mongo:3.4.4
+    steps:
+      - checkout
+      - run:
+          name: Update npm
+          command: 'sudo npm install -g npm@latest'
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+      - run:
+          name: Install npm
+          command: npm install
+      - save_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+  test:
+    docker:
+      - image: circleci/node:8-browsers
+    steps:
+      - checkout
+      - run:
+          name: Test
+          command: npm test
+      # - run:
+      #     name: Generate code coverage
+      #     command: './node_modules/.bin/nyc report --reporter=text-lcov'
+      # - store_artifacts:
+      #     path: test-results.xml
+      #     prefix: tests
+      # - store_artifacts:
+      #     path: coverage
+      #     prefix: coverage
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build
+      - test:
+          requires:
+            - build
+          filters:
+            branches:
+              only: master
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 6aba5c1be..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-machine:
-  node:
-    version: 8.1.4
-test:
-  override:
-    - "npm test"
-dependencies:
-  pre:
-    - sudo apt-get update
-    # get latest stable firefox
-    - sudo apt-get install firefox
-    - firefox_cmd=`which firefox`; sudo rm -f $firefox_cmd; sudo ln -s `which firefox.ubuntu` $firefox_cmd
-    # get latest stable chrome
-    - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-    - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-    - sudo apt-get update
-    - sudo apt-get install google-chrome-stable
\ No newline at end of file

From 4ed6ac92e4594f34db313765b6cc3d374d8b9c40 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 12:47:01 -0800
Subject: [PATCH 02/18] ci - update circle config

---
 .circleci/config.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 588b2968c..476b50996 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,18 @@
- version: 2
+version: 2
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build
+      - test:
+          requires:
+            - build
+          filters:
+            branches:
+              only: master
+
+
 jobs:
   build:
     # working_directory: ~/mern-starter
@@ -38,15 +52,3 @@ jobs:
       # - store_artifacts:
       #     path: coverage
       #     prefix: coverage
-
-workflows:
-  version: 2
-  build_and_test:
-    jobs:
-      - build
-      - test:
-          requires:
-            - build
-          filters:
-            branches:
-              only: master

From 8cf6db16f7b8c31d82ec06e18c9e47c0c6af1646 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 12:52:29 -0800
Subject: [PATCH 03/18] ci - test on all branches

---
 .circleci/config.yml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 476b50996..eca87ea5b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,19 +8,11 @@ workflows:
       - test:
           requires:
             - build
-          filters:
-            branches:
-              only: master
-
 
 jobs:
   build:
-    # working_directory: ~/mern-starter
-    # The primary container is an instance of the first list image listed. Your build commands run in this container.
     docker:
       - image: circleci/node:8-browsers
-    # # The secondary container is an instance of the second listed image which is run in a common network where ports exposed on the primary container are available on localhost.
-    #   - image: mongo:3.4.4
     steps:
       - checkout
       - run:
@@ -43,12 +35,3 @@ jobs:
       - run:
           name: Test
           command: npm test
-      # - run:
-      #     name: Generate code coverage
-      #     command: './node_modules/.bin/nyc report --reporter=text-lcov'
-      # - store_artifacts:
-      #     path: test-results.xml
-      #     prefix: tests
-      # - store_artifacts:
-      #     path: coverage
-      #     prefix: coverage

From 69345770fbe3bd111772e3f6f49635ad38fe5a5b Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 13:04:53 -0800
Subject: [PATCH 04/18] ci - restore node_modules before test

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index eca87ea5b..06506c680 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,12 +19,12 @@ jobs:
           name: Update npm
           command: 'sudo npm install -g npm@latest'
       - restore_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Install npm
           command: npm install
       - save_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
   test:
@@ -32,6 +32,8 @@ jobs:
       - image: circleci/node:8-browsers
     steps:
       - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Test
           command: npm test

From 828ac9a232e4241e9c4b90be06059c63b29f787b Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 13:15:36 -0800
Subject: [PATCH 05/18] ci - breakup npm test into parallel processes

---
 .circleci/config.yml | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 06506c680..e574febf9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,13 +4,20 @@ workflows:
   version: 2
   build_and_test:
     jobs:
-      - build
-      - test:
+      - prep-deps
+      - test-lint:
           requires:
-            - build
+            - prep-deps
+      - test-coverage:
+          requires:
+            - prep-deps
+      - test-integration:
+          requires:
+            - prep-deps
+
 
 jobs:
-  build:
+  prep-deps:
     docker:
       - image: circleci/node:8-browsers
     steps:
@@ -27,7 +34,7 @@ jobs:
           key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
-  test:
+  test-lint:
     docker:
       - image: circleci/node:8-browsers
     steps:
@@ -36,4 +43,24 @@ jobs:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Test
-          command: npm test
+          command: npm run lint
+  test-coverage:
+    docker:
+      - image: circleci/node:8-browsers
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package-lock.json" }}
+      - run:
+          name: test:coverage
+          command: npm run test:coverage
+  test-integration:
+    docker:
+      - image: circleci/node:8-browsers
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package-lock.json" }}
+      - run:
+          name: test:integration
+          command: npm run test:integration

From 79a0b22ea44eea3cc77b4c068fa0edddd1727c66 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 13:37:13 -0800
Subject: [PATCH 06/18] ci - parallize flat + mascara integration tests

---
 .circleci/config.yml | 57 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e574febf9..40e37d2b6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,19 +2,23 @@ version: 2
 
 workflows:
   version: 2
-  build_and_test:
+  full_test:
     jobs:
       - prep-deps
       - test-lint:
           requires:
             - prep-deps
-      - test-coverage:
+      - test-unit:
           requires:
             - prep-deps
-      - test-integration:
+      - test-integration-mascara:
           requires:
             - prep-deps
-
+            - prep-scss
+      - test-integration-flat:
+          requires:
+            - prep-deps
+            - prep-scss
 
 jobs:
   prep-deps:
@@ -34,6 +38,26 @@ jobs:
           key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
+  prep-scss:
+    docker:
+      - image: circleci/node:8-browsers
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package-lock.json" }}
+      - run:
+          name: Get Cache key
+          command: ls -laR ui/app/css/ > scss_checksum
+      - restore_cache:
+          key: scss-cache-{{ checksum "scss_checksum" }}
+      - run:
+          name: Build Scss
+          command: gulp build:scss
+      - save_cache:
+          key: scss-cache-{{ checksum "scss_checksum" }}
+          paths:
+            - ui/app/css/output
+
   test-lint:
     docker:
       - image: circleci/node:8-browsers
@@ -44,7 +68,8 @@ jobs:
       - run:
           name: Test
           command: npm run lint
-  test-coverage:
+
+  test-unit:
     docker:
       - image: circleci/node:8-browsers
     steps:
@@ -54,13 +79,29 @@ jobs:
       - run:
           name: test:coverage
           command: npm run test:coverage
-  test-integration:
+
+  test-integration-flat:
     docker:
       - image: circleci/node:8-browsers
     steps:
       - checkout
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
+      - restore_cache:
+          key: scss-cache-{{ checksum "scss_checksum" }}
       - run:
-          name: test:integration
-          command: npm run test:integration
+          name: test:integration:flat
+          command: npm run test:flat
+
+  test-integration-mascara:
+    docker:
+      - image: circleci/node:8-browsers
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package-lock.json" }}
+      - restore_cache:
+          key: scss-cache-{{ checksum "scss_checksum" }}
+      - run:
+          name: test:integration:mascara
+          command: npm run test:mascara

From e024b57150478093f0723c0f460470be21457340 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 13:41:18 -0800
Subject: [PATCH 07/18] ci - add prep-scss to flow

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 40e37d2b6..44ac40660 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,6 +5,9 @@ workflows:
   full_test:
     jobs:
       - prep-deps
+      - prep-scss:
+        requires:
+          - prep-deps
       - test-lint:
           requires:
             - prep-deps

From 7ad1421f61ec91b7562a72dc2b067fcc9bec8faa Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 13:43:18 -0800
Subject: [PATCH 08/18] ci - fix config formatting

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 44ac40660..ea6ce72b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,8 +6,8 @@ workflows:
     jobs:
       - prep-deps
       - prep-scss:
-        requires:
-          - prep-deps
+          requires:
+            - prep-deps
       - test-lint:
           requires:
             - prep-deps

From 35801966508355d4aaf819d9bbf2c570a2a445f3 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 13:48:48 -0800
Subject: [PATCH 09/18] test - breakout npm script for building for integration
 tests

---
 .circleci/config.yml | 4 ++--
 package.json         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea6ce72b2..527fb1b9e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,8 +54,8 @@ jobs:
       - restore_cache:
           key: scss-cache-{{ checksum "scss_checksum" }}
       - run:
-          name: Build Scss
-          command: gulp build:scss
+          name: Build for integration tests
+          command: test:integration:build
       - save_cache:
           key: scss-cache-{{ checksum "scss_checksum" }}
           paths:
diff --git a/package.json b/package.json
index fd2554f73..e5efe6ef5 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
     "test": "npm run lint && npm run test:coverage && npm run test:integration",
     "test:unit": "METAMASK_ENV=test mocha --exit --require babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
     "test:single": "METAMASK_ENV=test mocha --require test/helper.js",
-    "test:integration": "gulp build:scss && npm run test:flat && npm run test:mascara",
+    "test:integration": "npm run test:integration:build && npm run test:flat && npm run test:mascara",
+    "test:integration:build": "gulp build:scss",
     "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload",
     "test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi",
     "test:flat": "npm run test:flat:build && karma start test/flat.conf.js",

From 6c3706f3e86f71ce830e9599ebdc32f51b18bda9 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 13:50:57 -0800
Subject: [PATCH 10/18] ci - fix typo

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 527fb1b9e..33723602f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -50,12 +50,13 @@ jobs:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Cache key
+          # this allows us to checksum against a whole directory
           command: ls -laR ui/app/css/ > scss_checksum
       - restore_cache:
           key: scss-cache-{{ checksum "scss_checksum" }}
       - run:
           name: Build for integration tests
-          command: test:integration:build
+          command: npm run test:integration:build
       - save_cache:
           key: scss-cache-{{ checksum "scss_checksum" }}
           paths:

From dab47e5bfaa306a2fbdd4fe8a97b41715478d8b6 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 14:00:36 -0800
Subject: [PATCH 11/18] ci - integration tests need to generate scss cache key

---
 .circleci/config.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 33723602f..53a769c43 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,7 +49,7 @@ jobs:
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
-          name: Get Cache key
+          name: Get Scss Cache key
           # this allows us to checksum against a whole directory
           command: ls -laR ui/app/css/ > scss_checksum
       - restore_cache:
@@ -91,6 +91,10 @@ jobs:
       - checkout
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
+      - run:
+          name: Get Scss Cache key
+          # this allows us to checksum against a whole directory
+          command: ls -laR ui/app/css/ > scss_checksum
       - restore_cache:
           key: scss-cache-{{ checksum "scss_checksum" }}
       - run:
@@ -104,6 +108,10 @@ jobs:
       - checkout
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
+      - run:
+          name: Get Scss Cache key
+          # this allows us to checksum against a whole directory
+          command: ls -laR ui/app/css/ > scss_checksum
       - restore_cache:
           key: scss-cache-{{ checksum "scss_checksum" }}
       - run:

From 9378bc50d24fc6bcb90d9f9c5aef2d4dddd433d2 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 14:01:42 -0800
Subject: [PATCH 12/18] ci - optimize - dont update npm

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 53a769c43..8e194d446 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,13 +29,10 @@ jobs:
       - image: circleci/node:8-browsers
     steps:
       - checkout
-      - run:
-          name: Update npm
-          command: 'sudo npm install -g npm@latest'
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
-          name: Install npm
+          name: Install deps via npm
           command: npm install
       - save_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}

From 702d09b557952406bb66d0d8bd8e39f3db0d1079 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 14:27:27 -0800
Subject: [PATCH 13/18] ci - prep-deps - install latest firefox

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8e194d446..a49a6ccb2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,6 +38,10 @@ jobs:
           key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
+      - run:
+          name: Install Firefox
+          command: sudo apt-get install firefox; firefox_cmd=`which firefox`; sudo rm -f $firefox_cmd; sudo ln -s `which firefox.ubuntu` $firefox_cmd
+
   prep-scss:
     docker:
       - image: circleci/node:8-browsers
@@ -49,8 +53,6 @@ jobs:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
           command: ls -laR ui/app/css/ > scss_checksum
-      - restore_cache:
-          key: scss-cache-{{ checksum "scss_checksum" }}
       - run:
           name: Build for integration tests
           command: npm run test:integration:build

From 6093d46ba11335f6f71c912f2a70f07f6423181a Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 14:58:02 -0800
Subject: [PATCH 14/18] ci - install firefox58 and cache

---
 .circleci/config.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a49a6ccb2..24e9a57b0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,19 @@ jobs:
             - node_modules
       - run:
           name: Install Firefox
-          command: sudo apt-get install firefox; firefox_cmd=`which firefox`; sudo rm -f $firefox_cmd; sudo ln -s `which firefox.ubuntu` $firefox_cmd
+          command: >
+            wget https://ftp.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/en-US/firefox-58.0.tar.bz2
+            && tar xjf firefox-58.0.tar.bz2
+            && sudo rm -r /opt/firefox
+            && sudo mv firefox /opt/firefox58
+            && sudo mv /usr/bin/firefox /usr/bin/firefox-old
+            && sudo ln -s /opt/firefox58/firefox /usr/bin/firefox
+      - save_cache:
+          key: dependency-cache-firefox
+          paths:
+            - /opt/
+            - /usr/bin
+
 
   prep-scss:
     docker:
@@ -88,6 +100,8 @@ jobs:
       - image: circleci/node:8-browsers
     steps:
       - checkout
+      - restore_cache:
+          key: dependency-cache-firefox
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
@@ -105,6 +119,8 @@ jobs:
       - image: circleci/node:8-browsers
     steps:
       - checkout
+      - restore_cache:
+          key: dependency-cache-firefox
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:

From a59d9d996c604900e98d492de2a7279298e0fb62 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 15:11:09 -0800
Subject: [PATCH 15/18] ci - split download and install firefox steps

---
 .circleci/config.yml | 46 ++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 24e9a57b0..047d2846d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,27 +4,30 @@ workflows:
   version: 2
   full_test:
     jobs:
-      - prep-deps
+      - prep-deps-npm
+      - prep-deps-firefox
       - prep-scss:
           requires:
-            - prep-deps
+            - prep-deps-npm
       - test-lint:
           requires:
-            - prep-deps
+            - prep-deps-npm
       - test-unit:
           requires:
-            - prep-deps
+            - prep-deps-npm
       - test-integration-mascara:
           requires:
-            - prep-deps
+            - prep-deps-npm
+            - prep-deps-firefox
             - prep-scss
       - test-integration-flat:
           requires:
-            - prep-deps
+            - prep-deps-npm
+            - prep-deps-firefox
             - prep-scss
 
 jobs:
-  prep-deps:
+  prep-deps-npm:
     docker:
       - image: circleci/node:8-browsers
     steps:
@@ -38,20 +41,21 @@ jobs:
           key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
+
+  prep-deps-firefox:
+    docker:
+      - image: circleci/node:8-browsers
+    steps:
+      - checkout
       - run:
-          name: Install Firefox
+          name: Download Firefox
           command: >
             wget https://ftp.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/en-US/firefox-58.0.tar.bz2
             && tar xjf firefox-58.0.tar.bz2
-            && sudo rm -r /opt/firefox
-            && sudo mv firefox /opt/firefox58
-            && sudo mv /usr/bin/firefox /usr/bin/firefox-old
-            && sudo ln -s /opt/firefox58/firefox /usr/bin/firefox
       - save_cache:
           key: dependency-cache-firefox
           paths:
-            - /opt/
-            - /usr/bin
+            - firefox
 
 
   prep-scss:
@@ -102,6 +106,13 @@ jobs:
       - checkout
       - restore_cache:
           key: dependency-cache-firefox
+      - run:
+          name: Install firefox
+          command: >
+            sudo rm -r /opt/firefox
+            && sudo mv firefox /opt/firefox58
+            && sudo mv /usr/bin/firefox /usr/bin/firefox-old
+            && sudo ln -s /opt/firefox58/firefox /usr/bin/firefox
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
@@ -121,6 +132,13 @@ jobs:
       - checkout
       - restore_cache:
           key: dependency-cache-firefox
+      - run:
+          name: Install firefox
+          command: >
+            sudo rm -r /opt/firefox
+            && sudo mv firefox /opt/firefox58
+            && sudo mv /usr/bin/firefox /usr/bin/firefox-old
+            && sudo ln -s /opt/firefox58/firefox /usr/bin/firefox
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:

From 650a88412bae24580816f59e104760bdc324d77a Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 15:16:34 -0800
Subject: [PATCH 16/18] ci - cache firefox install under build number

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 047d2846d..49436eda8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,7 +53,7 @@ jobs:
             wget https://ftp.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/en-US/firefox-58.0.tar.bz2
             && tar xjf firefox-58.0.tar.bz2
       - save_cache:
-          key: dependency-cache-firefox
+          key: dependency-cache-firefox-{{ .BuildNum }}
           paths:
             - firefox
 
@@ -105,7 +105,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox
+          key: dependency-cache-firefox-{{ .BuildNum }}
       - run:
           name: Install firefox
           command: >
@@ -131,7 +131,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox
+          key: dependency-cache-firefox-{{ .BuildNum }}
       - run:
           name: Install firefox
           command: >

From 5cbd5cd50a3f056af37a339b9dccf3332a916fe0 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 15:20:59 -0800
Subject: [PATCH 17/18] ci - cache firefox against Revision

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 49436eda8..0eb046136 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,7 +53,7 @@ jobs:
             wget https://ftp.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/en-US/firefox-58.0.tar.bz2
             && tar xjf firefox-58.0.tar.bz2
       - save_cache:
-          key: dependency-cache-firefox-{{ .BuildNum }}
+          key: dependency-cache-firefox-{{ .Revision }}
           paths:
             - firefox
 
@@ -105,7 +105,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox-{{ .BuildNum }}
+          key: dependency-cache-firefox-{{ .Revision }}
       - run:
           name: Install firefox
           command: >
@@ -131,7 +131,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox-{{ .BuildNum }}
+          key: dependency-cache-firefox-{{ .Revision }}
       - run:
           name: Install firefox
           command: >

From efe516857a8177bfbc95af7a5aeda63c565ece25 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 9 Mar 2018 15:30:58 -0800
Subject: [PATCH 18/18] ci - adjust scss cache key

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0eb046136..9cd0a24ec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,7 +68,7 @@ jobs:
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
-          command: ls -laR ui/app/css/ > scss_checksum
+          command: find ui/app/css -type f -exec md5sum {} \; | sort -k 2 > scss_checksum
       - run:
           name: Build for integration tests
           command: npm run test:integration:build
@@ -118,7 +118,7 @@ jobs:
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
-          command: ls -laR ui/app/css/ > scss_checksum
+          command: find ui/app/css -type f -exec md5sum {} \; | sort -k 2 > scss_checksum
       - restore_cache:
           key: scss-cache-{{ checksum "scss_checksum" }}
       - run:
@@ -144,7 +144,7 @@ jobs:
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
-          command: ls -laR ui/app/css/ > scss_checksum
+          command: find ui/app/css -type f -exec md5sum {} \; | sort -k 2 > scss_checksum
       - restore_cache:
           key: scss-cache-{{ checksum "scss_checksum" }}
       - run: