From 170d05d2e6074b73b3bc8f3493c99e3ef2d73cb6 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Thu, 5 Jul 2018 22:11:58 -0400
Subject: Proper caching of node_modules

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0ad5cdf53..c643b72cc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -101,7 +101,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Install deps via npm
           command: npm install
@@ -109,10 +109,6 @@ jobs:
           key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
-      - save_cache:
-          key: dependency-cache-{{ .Revision }}
-          paths:
-            - node_modules
 
   prep-deps-firefox:
     docker:
@@ -133,7 +129,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: build:dist
           command: npm run dist
@@ -152,7 +148,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: build:dist
           command: npm run doc
@@ -167,7 +163,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -186,7 +182,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Test
           command: npm run lint
@@ -197,7 +193,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Test
           command: npx nsp check
@@ -208,7 +204,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -229,7 +225,7 @@ jobs:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -245,7 +241,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -266,7 +262,7 @@ jobs:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -282,7 +278,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -299,7 +295,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - restore_cache:
@@ -326,7 +322,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - restore_cache:
@@ -349,7 +345,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: test:coverage
           command: npm run test:coverage
@@ -367,7 +363,7 @@ jobs:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -386,7 +382,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -410,7 +406,7 @@ jobs:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -429,7 +425,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
-- 
cgit v1.2.3


From 816b3a9d111c535fa60a0364e3d6f1c5c43bbb16 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Thu, 5 Jul 2018 23:26:12 -0400
Subject: use package-lock only for the initial restore

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c643b72cc..9b4c7597b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -109,6 +109,10 @@ jobs:
           key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
+      - save_cache:
+          key: dependency-cache-{{ .Revision }}
+          paths:
+            - node_modules
 
   prep-deps-firefox:
     docker:
@@ -129,7 +133,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - run:
           name: build:dist
           command: npm run dist
@@ -148,7 +152,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - run:
           name: build:dist
           command: npm run doc
@@ -163,7 +167,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -182,7 +186,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - run:
           name: Test
           command: npm run lint
@@ -193,7 +197,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - run:
           name: Test
           command: npx nsp check
@@ -204,7 +208,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -225,7 +229,7 @@ jobs:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -241,7 +245,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -262,7 +266,7 @@ jobs:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -278,7 +282,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -295,7 +299,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - restore_cache:
@@ -322,7 +326,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - restore_cache:
@@ -345,7 +349,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - run:
           name: test:coverage
           command: npm run test:coverage
@@ -363,7 +367,7 @@ jobs:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -382,7 +386,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -406,7 +410,7 @@ jobs:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -425,7 +429,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Revision }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
-- 
cgit v1.2.3


From 1387f1c8c21adfa99e336290f040bb1d65f28fd2 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 00:14:33 -0400
Subject: Another update

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9b4c7597b..891c9715e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -102,17 +102,16 @@ jobs:
       - checkout
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
+      - run:
+          name: Install npm 6
+          command: npm install -g npm@6
       - run:
           name: Install deps via npm
           command: npm install
       - save_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
-          paths:
-            - node_modules
-      - save_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package.json" }}
           paths:
-            - node_modules
+            - ./node_modules
 
   prep-deps-firefox:
     docker:
@@ -133,7 +132,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: build:dist
           command: npm run dist
@@ -152,7 +151,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: build:dist
           command: npm run doc
@@ -167,7 +166,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -186,7 +185,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Test
           command: npm run lint
@@ -197,7 +196,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Test
           command: npx nsp check
@@ -208,7 +207,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -229,7 +228,7 @@ jobs:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -245,7 +244,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -266,7 +265,7 @@ jobs:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -282,7 +281,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - run:
@@ -299,7 +298,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - restore_cache:
@@ -326,7 +325,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
           key: build-cache-{{ .Revision }}
       - restore_cache:
@@ -349,7 +348,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: test:coverage
           command: npm run test:coverage
@@ -367,7 +366,7 @@ jobs:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -386,7 +385,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -410,7 +409,7 @@ jobs:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -429,7 +428,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ .Revision }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
-- 
cgit v1.2.3


From 76912c8a0dfbb2193a697b76e97e113aee0a0e57 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 00:15:29 -0400
Subject: use sudo to install npm

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 891c9715e..60cd47a0f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -104,7 +104,7 @@ jobs:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Install npm 6
-          command: npm install -g npm@6
+          command: sudo npm install -g npm@6
       - run:
           name: Install deps via npm
           command: npm install
-- 
cgit v1.2.3


From 65a349dd30e6aa72dca4694e939ca28486b2e182 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 00:21:04 -0400
Subject: Update config.yml

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 60cd47a0f..3051847b0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -109,7 +109,7 @@ jobs:
           name: Install deps via npm
           command: npm install
       - save_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
             - ./node_modules
 
-- 
cgit v1.2.3


From 9ca9e90e4cdc8fafcbb9f6e1c7509e9fcf7f256f Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 00:22:40 -0400
Subject: Update config.yml

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3051847b0..08d355bb5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -102,9 +102,6 @@ jobs:
       - checkout
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
-      - run:
-          name: Install npm 6
-          command: sudo npm install -g npm@6
       - run:
           name: Install deps via npm
           command: npm install
-- 
cgit v1.2.3


From ca09a0be831a5bd5e094a5cdaf7bdf76e7b4fb71 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 00:32:12 -0400
Subject: Update config.yml

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 08d355bb5..0cbbaf2e0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -104,11 +104,15 @@ jobs:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Install deps via npm
-          command: npm install
+          command: |
+          if [ ! -d node_modules ]; then
+            sudo npm install -g npm@$NPM_VERSION
+            npm ci
+          fi
       - save_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
-            - ./node_modules
+            - node_modules
 
   prep-deps-firefox:
     docker:
-- 
cgit v1.2.3


From e29804224abae1a3fbadc7a3ad52e394deb4390a Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 00:33:19 -0400
Subject: Fix indentation

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0cbbaf2e0..83570894f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -105,10 +105,10 @@ jobs:
       - run:
           name: Install deps via npm
           command: |
-          if [ ! -d node_modules ]; then
-            sudo npm install -g npm@$NPM_VERSION
-            npm ci
-          fi
+            if [ ! -d node_modules ]; then
+              sudo npm install -g npm@$NPM_VERSION
+              npm ci
+            fi
       - save_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
-- 
cgit v1.2.3


From 0f2a5ece48ec924a7eb90a1ff5104a788d819c32 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 00:38:13 -0400
Subject: Update config.yml

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 83570894f..92415673a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,7 +106,7 @@ jobs:
           name: Install deps via npm
           command: |
             if [ ! -d node_modules ]; then
-              sudo npm install -g npm@$NPM_VERSION
+              sudo npm install -g npm@6
               npm ci
             fi
       - save_cache:
-- 
cgit v1.2.3


From 38e54af0930cf486cd1a68dfbccfe0e710ec7d9a Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 00:54:21 -0400
Subject: try npm install instead of npm ci

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 92415673a..e7ce09371 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -107,7 +107,7 @@ jobs:
           command: |
             if [ ! -d node_modules ]; then
               sudo npm install -g npm@6
-              npm ci
+              npm install
             fi
       - save_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
-- 
cgit v1.2.3


From c567a4b8f3d81c9e8f8fe6f9795e57d5b57bdcce Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 14:38:01 -0400
Subject: Check for changes on package-lock.json and exit with error

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e7ce09371..401e3b309 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,6 +108,11 @@ jobs:
             if [ ! -d node_modules ]; then
               sudo npm install -g npm@6
               npm install
+              # If the package-lock.json has changed, die with an error
+              CHANGED_FILES="$(git diff --name-only package-lock.json)"
+              echo "$CHANGED_FILES" | grep --quiet "package-lock.json" && 
+              echo "Looks like package-lock.json has changed. Did you forget to include it on your PR?" && 
+              exit
             fi
       - save_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
-- 
cgit v1.2.3


From a875caa20cbe1ed3196ebb50e57f04190d6e6633 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 14:48:39 -0400
Subject: Fallback to using the latest cache if no exact match is found

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 401e3b309..c9c827a1c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -101,7 +101,10 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          keys:
+            - dependency-cache-{{ checksum "package-lock.json" }}
+            # fallback to using the latest cache if no exact match is found
+            - dependency-cache-
       - run:
           name: Install deps via npm
           command: |
-- 
cgit v1.2.3


From d9c78fc6458b9fcdf02ddf2ecdbfcc3837f2e65f Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 15:15:23 -0400
Subject: simpler approach

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c9c827a1c..63f6a64b1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,15 +108,8 @@ jobs:
       - run:
           name: Install deps via npm
           command: |
-            if [ ! -d node_modules ]; then
-              sudo npm install -g npm@6
-              npm install
-              # If the package-lock.json has changed, die with an error
-              CHANGED_FILES="$(git diff --name-only package-lock.json)"
-              echo "$CHANGED_FILES" | grep --quiet "package-lock.json" && 
-              echo "Looks like package-lock.json has changed. Did you forget to include it on your PR?" && 
-              exit
-            fi
+           sudo npm install -g npm@6
+           npm install
       - save_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
-- 
cgit v1.2.3


From af04ca59e9f24892f2e0cf1a783feedd9e88ad06 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 15:26:06 -0400
Subject: Run npm install only when needed

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 63f6a64b1..e41b919fa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,7 +108,10 @@ jobs:
       - run:
           name: Install deps via npm
           command: |
-           sudo npm install -g npm@6
+           # Only run npm install if the package-lock.json or package.json was changed
+           CHANGED_FILES="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"
+	         echo "$CHANGED_FILES" | grep --quiet "package.*json" && 
+           sudo npm install -g npm@6 &&
            npm install
       - save_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
-- 
cgit v1.2.3


From f8c23d2bf986d8fa7ccef49a2ab5ae2e9bd12e67 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 15:26:33 -0400
Subject: Fix indentation

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e41b919fa..7f0a55a36 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -110,7 +110,7 @@ jobs:
           command: |
            # Only run npm install if the package-lock.json or package.json was changed
            CHANGED_FILES="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"
-	         echo "$CHANGED_FILES" | grep --quiet "package.*json" && 
+	   echo "$CHANGED_FILES" | grep --quiet "package.*json" && 
            sudo npm install -g npm@6 &&
            npm install
       - save_cache:
-- 
cgit v1.2.3


From 8733982d7e71cb7eb282ea276f7357ec656376ab Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 15:28:46 -0400
Subject: Fix indentation again

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7f0a55a36..014964304 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -110,7 +110,7 @@ jobs:
           command: |
            # Only run npm install if the package-lock.json or package.json was changed
            CHANGED_FILES="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"
-	   echo "$CHANGED_FILES" | grep --quiet "package.*json" && 
+           echo "$CHANGED_FILES" | grep --quiet "package.*json" && 
            sudo npm install -g npm@6 &&
            npm install
       - save_cache:
-- 
cgit v1.2.3


From 24b0e6a4f82a81569bba84af7f0a96a1d5eb1405 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 15:33:53 -0400
Subject: Final approach

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 014964304..69d407d2b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,13 +106,9 @@ jobs:
             # fallback to using the latest cache if no exact match is found
             - dependency-cache-
       - run:
-          name: Install deps via npm
+          name: Install npm 6 + deps via npm
           command: |
-           # Only run npm install if the package-lock.json or package.json was changed
-           CHANGED_FILES="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"
-           echo "$CHANGED_FILES" | grep --quiet "package.*json" && 
-           sudo npm install -g npm@6 &&
-           npm install
+           sudo npm install -g npm@6.1.0 && npm install
       - save_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
-- 
cgit v1.2.3


From 5b58c2acb47ce7fa9631836ac71539e8109ad619 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 15:50:57 -0400
Subject: Update config.yml to allow firefox download caching

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 69d407d2b..cfc657a22 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -119,11 +119,13 @@ jobs:
       - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
+      - restore_cache:
+          keys: dependency-cache-firefox
       - run:
-          name: Download Firefox
+          name: Download Firefox If needed
           command: ./.circleci/scripts/firefox-download.sh
       - save_cache:
-          key: dependency-cache-firefox-{{ .Revision }}
+          key: dependency-cache-firefox
           paths:
             - firefox
 
@@ -224,7 +226,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox-{{ .Revision }}
+          key: dependency-cache-firefox
       - run:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
@@ -261,7 +263,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox-{{ .Revision }}
+          key: dependency-cache-firefox
       - run:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
@@ -362,7 +364,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox-{{ .Revision }}
+          key: dependency-cache-firefox
       - run:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
@@ -405,7 +407,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox-{{ .Revision }}
+          key: dependency-cache-firefox
       - run:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
-- 
cgit v1.2.3


From 0af1702a3fc2f377e0790513639e8cf65fb30525 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 15:51:35 -0400
Subject: Allow firefox binary to be cached

---
 .circleci/scripts/firefox-download.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/scripts/firefox-download.sh b/.circleci/scripts/firefox-download.sh
index c63e8c3df..4b828a6ff 100755
--- a/.circleci/scripts/firefox-download.sh
+++ b/.circleci/scripts/firefox-download.sh
@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
+FIREFOX_BINARY="firefox-58.0.tar.bz2"
+echo "Checking if firefox was already downloaded"
+if [ -e $FIREFOX_BINARY ]
+then
+    echo "$FIREFOX_BINARY found. No need to download"
+else
+    echo "Downloading firefox..."
+    wget "https://ftp.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/en-US/$FIREFOX_BINARY" \
+    && tar xjf "$FIREFOX_BINARY"
+    echo "firefox download complete"
+fi
 
-echo "Downloading firefox..."
-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
-echo "firefox download complete"
-- 
cgit v1.2.3


From cdd556fb2700019d79b7e362ba1a5ccd5559e35a Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 15:58:07 -0400
Subject: Add firefox binary to cache path

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cfc657a22..ce38fca27 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -128,6 +128,7 @@ jobs:
           key: dependency-cache-firefox
           paths:
             - firefox
+            - firefox-58.0.tar.bz2
 
   prep-build:
     docker:
-- 
cgit v1.2.3


From e0719a0358dc3fca11fa920f0f493d1a56a2e0fc Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 16:16:18 -0400
Subject: Update firefox-download.sh

---
 .circleci/scripts/firefox-download.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/scripts/firefox-download.sh b/.circleci/scripts/firefox-download.sh
index 4b828a6ff..1cb9ba5ac 100755
--- a/.circleci/scripts/firefox-download.sh
+++ b/.circleci/scripts/firefox-download.sh
@@ -1,13 +1,12 @@
 #!/usr/bin/env bash
-FIREFOX_BINARY="firefox-58.0.tar.bz2"
 echo "Checking if firefox was already downloaded"
-if [ -e $FIREFOX_BINARY ]
+if [ -d "firefox" ]
 then
-    echo "$FIREFOX_BINARY found. No need to download"
+    echo "Firefox found. No need to download"
 else
+    FIREFOX_BINARY="firefox-61.0.1.tar.bz2"
     echo "Downloading firefox..."
     wget "https://ftp.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/en-US/$FIREFOX_BINARY" \
     && tar xjf "$FIREFOX_BINARY"
     echo "firefox download complete"
 fi
-
-- 
cgit v1.2.3


From 8d72ae81c97778e4a7e781b3068b41123ce72c47 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 16:29:43 -0400
Subject: tmp commit to force firefox update

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ce38fca27..0815cc2ba 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -119,16 +119,15 @@ jobs:
       - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
-      - restore_cache:
-          keys: dependency-cache-firefox
+      # - restore_cache:
+      #    keys: dependency-cache-firefox-
       - run:
           name: Download Firefox If needed
           command: ./.circleci/scripts/firefox-download.sh
       - save_cache:
-          key: dependency-cache-firefox
-          paths:
+          key: dependency-cache-firefox-{{ .Revision }}
+          path:
             - firefox
-            - firefox-58.0.tar.bz2
 
   prep-build:
     docker:
@@ -227,14 +226,10 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox
+          key: dependency-cache-firefox-
       - run:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
-      - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
-      - restore_cache:
-          key: build-cache-{{ .Revision }}
       - run:
           name: test:e2e:firefox
           command: npm run test:e2e:firefox
@@ -264,7 +259,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox
+          key: dependency-cache-firefox-
       - run:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
@@ -365,7 +360,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox
+          key: dependency-cache-firefox-
       - run:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
@@ -408,7 +403,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox
+          key: dependency-cache-firefox-
       - run:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
-- 
cgit v1.2.3


From 48dbe30217abe0c10f3dc8cba4211f6339966b37 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 16:31:03 -0400
Subject: oops

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0815cc2ba..5cde1c546 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -126,7 +126,7 @@ jobs:
           command: ./.circleci/scripts/firefox-download.sh
       - save_cache:
           key: dependency-cache-firefox-{{ .Revision }}
-          path:
+          paths:
             - firefox
 
   prep-build:
-- 
cgit v1.2.3


From 79011dbc59499d8c2016365578fd955f3f1dcce4 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 16:33:39 -0400
Subject: Firefox cache working properly

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5cde1c546..b1dbac21a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -119,8 +119,8 @@ jobs:
       - image: circleci/node:8.11.3-browsers
     steps:
       - checkout
-      # - restore_cache:
-      #    keys: dependency-cache-firefox-
+      - restore_cache:
+        keys: dependency-cache-firefox-
       - run:
           name: Download Firefox If needed
           command: ./.circleci/scripts/firefox-download.sh
-- 
cgit v1.2.3


From ca17cfbc65d0d83caeb88ba70d8dcc3520d55f3f Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 16:36:01 -0400
Subject: Fix indentation

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b1dbac21a..4e6f836e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -120,7 +120,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-        keys: dependency-cache-firefox-
+          keys: dependency-cache-firefox-
       - run:
           name: Download Firefox If needed
           command: ./.circleci/scripts/firefox-download.sh
-- 
cgit v1.2.3


From 32813b23a252e93f7ec5aa1ef265df7daf3aa834 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 16:44:06 -0400
Subject: Update firefox-download.sh

---
 .circleci/scripts/firefox-download.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/scripts/firefox-download.sh b/.circleci/scripts/firefox-download.sh
index 1cb9ba5ac..768f1c048 100755
--- a/.circleci/scripts/firefox-download.sh
+++ b/.circleci/scripts/firefox-download.sh
@@ -4,9 +4,10 @@ if [ -d "firefox" ]
 then
     echo "Firefox found. No need to download"
 else
-    FIREFOX_BINARY="firefox-61.0.1.tar.bz2"
+    FIREFOX_VERSION="61.0.1"
+    FIREFOX_BINARY="firefox-${!FIREFOX_VERSION}.tar.bz2"
     echo "Downloading firefox..."
-    wget "https://ftp.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/en-US/$FIREFOX_BINARY" \
+    wget "https://ftp.mozilla.org/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/$FIREFOX_BINARY" \
     && tar xjf "$FIREFOX_BINARY"
     echo "firefox download complete"
 fi
-- 
cgit v1.2.3


From dd21d29b2b659230cbc668266e1187b5c9524047 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 16:44:27 -0400
Subject: Update config.yml

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4e6f836e5..6af712ee4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -120,7 +120,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          keys: dependency-cache-firefox-
+          keys: dependency-cache-firefox-{{ .Revision }}
       - run:
           name: Download Firefox If needed
           command: ./.circleci/scripts/firefox-download.sh
-- 
cgit v1.2.3


From a1e7b51ef03ef8fe5f295883a00a33f060af2174 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 16:45:24 -0400
Subject: Update config.yml

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6af712ee4..8ba471c1b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -120,7 +120,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          keys: dependency-cache-firefox-{{ .Revision }}
+          key: dependency-cache-firefox-{{ .Revision }}
       - run:
           name: Download Firefox If needed
           command: ./.circleci/scripts/firefox-download.sh
-- 
cgit v1.2.3


From 759b5b20ec3b6eb2d33f218c28ab3650f5cc86cd Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 16:48:17 -0400
Subject: Forgot this is linux bash

---
 .circleci/scripts/firefox-download.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.circleci')

diff --git a/.circleci/scripts/firefox-download.sh b/.circleci/scripts/firefox-download.sh
index 768f1c048..64f0c74e3 100755
--- a/.circleci/scripts/firefox-download.sh
+++ b/.circleci/scripts/firefox-download.sh
@@ -5,7 +5,7 @@ then
     echo "Firefox found. No need to download"
 else
     FIREFOX_VERSION="61.0.1"
-    FIREFOX_BINARY="firefox-${!FIREFOX_VERSION}.tar.bz2"
+    FIREFOX_BINARY="firefox-$FIREFOX_VERSION.tar.bz2"
     echo "Downloading firefox..."
     wget "https://ftp.mozilla.org/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/$FIREFOX_BINARY" \
     && tar xjf "$FIREFOX_BINARY"
-- 
cgit v1.2.3


From b90ec2a901d1b19d3d3c9d48d98aae98c541cce8 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 16:49:50 -0400
Subject: lets cache firefox 61

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8ba471c1b..4e7fd3b18 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -120,7 +120,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox-{{ .Revision }}
+          key: dependency-cache-firefox-
       - run:
           name: Download Firefox If needed
           command: ./.circleci/scripts/firefox-download.sh
-- 
cgit v1.2.3


From 104c4674dacee55eec9bdbd0ffef8e232a64bd82 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 16:53:53 -0400
Subject: Update firefox version

---
 .circleci/scripts/firefox-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/scripts/firefox-install.sh b/.circleci/scripts/firefox-install.sh
index 589bcbbb5..1c60f4de9 100755
--- a/.circleci/scripts/firefox-install.sh
+++ b/.circleci/scripts/firefox-install.sh
@@ -2,7 +2,7 @@
 
 echo "Installing firefox..."
 sudo rm -r /opt/firefox
-sudo mv firefox /opt/firefox58
+sudo mv firefox /opt/firefox61
 sudo mv /usr/bin/firefox /usr/bin/firefox-old
-sudo ln -s /opt/firefox58/firefox /usr/bin/firefox
+sudo ln -s /opt/firefox61/firefox /usr/bin/firefox
 echo "Firefox installed."
-- 
cgit v1.2.3


From ae1c8b854f634f76b6cfe6d46f1eda50319e2995 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 17:13:54 -0400
Subject: Firefox tests fix

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4e7fd3b18..0c341a99a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -230,6 +230,8 @@ jobs:
       - run:
           name: Install firefox
           command: ./.circleci/scripts/firefox-install.sh
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: test:e2e:firefox
           command: npm run test:e2e:firefox
-- 
cgit v1.2.3


From 8de2b3b1b084b2980b916df11b8c01ed38342dde Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 17:16:28 -0400
Subject: dont cache what's already cached

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0c341a99a..5e03a20ec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -125,7 +125,7 @@ jobs:
           name: Download Firefox If needed
           command: ./.circleci/scripts/firefox-download.sh
       - save_cache:
-          key: dependency-cache-firefox-{{ .Revision }}
+          key: dependency-cache-firefox-
           paths:
             - firefox
 
-- 
cgit v1.2.3


From 573659c863995d91035aee55407b5edc8851443d Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <bruno.barbieri@consensys.net>
Date: Fri, 6 Jul 2018 17:32:06 -0400
Subject: Added missing step

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5e03a20ec..7063f3113 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -232,6 +232,8 @@ jobs:
           command: ./.circleci/scripts/firefox-install.sh
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
+      - restore_cache:
+          key: build-cache-{{ .Revision }}
       - run:
           name: test:e2e:firefox
           command: npm run test:e2e:firefox
-- 
cgit v1.2.3


From a319c8ce4218429239673f458bb38a4ce776a2f0 Mon Sep 17 00:00:00 2001
From: bitpshr <mail@bitpshr.net>
Date: Thu, 19 Jul 2018 07:57:41 -0400
Subject: Version Circle cache keys for easy flushing

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7063f3113..9ca8b4521 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -102,15 +102,15 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - dependency-cache-{{ checksum "package-lock.json" }}
+            - v1-dependency-cache-{{ checksum "package-lock.json" }}
             # fallback to using the latest cache if no exact match is found
-            - dependency-cache-
+            - v1-dependency-cache-
       - run:
           name: Install npm 6 + deps via npm
           command: |
            sudo npm install -g npm@6.1.0 && npm install
       - save_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: v1-dependency-cache-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
 
@@ -120,12 +120,12 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-firefox-
+          key: v1-dependency-cache-firefox-
       - run:
           name: Download Firefox If needed
           command: ./.circleci/scripts/firefox-download.sh
       - save_cache:
-          key: dependency-cache-firefox-
+          key: v1-dependency-cache-firefox-
           paths:
             - firefox
 
@@ -135,7 +135,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: v1-dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: build:dist
           command: npm run dist
@@ -143,7 +143,7 @@ jobs:
           name: build:debug
           command: find dist/ -type f -exec md5sum {} \; | sort -k 2
       - save_cache:
-          key: build-cache-{{ .Revision }}
+          key: v1-build-cache-{{ .Revision }}
           paths:
             - dist
             - builds
@@ -154,12 +154,12 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: v1-dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: build:dist
           command: npm run doc
       - save_cache:
-          key: docs-cache-{{ .Revision }}
+          key: v1-docs-cache-{{ .Revision }}
           paths:
             - docs/jsdoc
 
@@ -169,7 +169,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: v1-dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -178,7 +178,7 @@ jobs:
           name: Build for integration tests
           command: npm run test:integration:build
       - save_cache:
-          key: scss-cache-{{ checksum "scss_checksum" }}
+          key: v1-scss-cache-{{ checksum "scss_checksum" }}
           paths:
             - ui/app/css/output
 
@@ -286,12 +286,12 @@ jobs:
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
-          key: build-cache-{{ .Revision }}
+          key: v1-build-cache-{{ .Revision }}
       - run:
           name: Test
           command: npm run test:screens
       - save_cache:
-          key: job-screens-{{ .Revision }}
+          key: v1-job-screens-{{ .Revision }}
           paths:
             - test-artifacts
 
-- 
cgit v1.2.3


From d85fc246c561972baf938c9f6cf41d2922f8a17a Mon Sep 17 00:00:00 2001
From: bitpshr <mail@bitpshr.net>
Date: Thu, 19 Jul 2018 08:11:09 -0400
Subject: Revert package-lock changes

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

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9ca8b4521..c0262fcfa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -102,15 +102,15 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v1-dependency-cache-{{ checksum "package-lock.json" }}
+            - dependency-cache-{{ checksum "package-lock.json" }}
             # fallback to using the latest cache if no exact match is found
-            - v1-dependency-cache-
+            - dependency-cache-
       - run:
           name: Install npm 6 + deps via npm
           command: |
            sudo npm install -g npm@6.1.0 && npm install
       - save_cache:
-          key: v1-dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
 
@@ -120,12 +120,12 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: v1-dependency-cache-firefox-
+          key: dependency-cache-firefox-
       - run:
           name: Download Firefox If needed
           command: ./.circleci/scripts/firefox-download.sh
       - save_cache:
-          key: v1-dependency-cache-firefox-
+          key: dependency-cache-firefox-
           paths:
             - firefox
 
@@ -135,7 +135,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: v1-dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: build:dist
           command: npm run dist
@@ -143,7 +143,7 @@ jobs:
           name: build:debug
           command: find dist/ -type f -exec md5sum {} \; | sort -k 2
       - save_cache:
-          key: v1-build-cache-{{ .Revision }}
+          key: build-cache-{{ .Revision }}
           paths:
             - dist
             - builds
@@ -154,12 +154,12 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: v1-dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: build:dist
           command: npm run doc
       - save_cache:
-          key: v1-docs-cache-{{ .Revision }}
+          key: docs-cache-{{ .Revision }}
           paths:
             - docs/jsdoc
 
@@ -169,7 +169,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: v1-dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get Scss Cache key
           # this allows us to checksum against a whole directory
@@ -178,7 +178,7 @@ jobs:
           name: Build for integration tests
           command: npm run test:integration:build
       - save_cache:
-          key: v1-scss-cache-{{ checksum "scss_checksum" }}
+          key: scss-cache-{{ checksum "scss_checksum" }}
           paths:
             - ui/app/css/output
 
@@ -286,12 +286,12 @@ jobs:
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - restore_cache:
-          key: v1-build-cache-{{ .Revision }}
+          key: build-cache-{{ .Revision }}
       - run:
           name: Test
           command: npm run test:screens
       - save_cache:
-          key: v1-job-screens-{{ .Revision }}
+          key: job-screens-{{ .Revision }}
           paths:
             - test-artifacts
 
@@ -448,4 +448,4 @@ jobs:
     steps:
       - run:
           name: All Tests Passed
-          command: echo 'weew - everything passed!'
+          command: echo 'weew - everything passed!'
\ No newline at end of file
-- 
cgit v1.2.3