From 97a9a505caabb7f3650c544b9a726d0e0ba030fd Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Fri, 15 Nov 2019 09:11:31 -0500
Subject: [PATCH] Clean up NPM_PUBLISH step

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 05c03651d..59c198993 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -213,16 +213,15 @@ jobs:
   NPM_PUBLISH:
     <<: *defaults
     steps:
-      # Update yarn
       - run: yarn -v
       # Checkout code and ALL Git Tags
       - checkout:
           post:
             - git fetch --all
+      # Use increasingly general patterns to restore cache
       - restore_cache:
           name: Restore Yarn and Cypress Package Cache
           keys:
-            # when lock file changes, use increasingly general patterns to restore cache
             - yarn-packages-{{ checksum "yarn.lock" }}
             - yarn-packages-
       - run:
@@ -231,23 +230,22 @@ jobs:
       - save_cache:
           name: Save Yarn Package Cache
           paths:
-            - ~/.cache ## Cache yarn and Cypress
+            - ~/.cache/yarn
           key: yarn-packages-{{ checksum "yarn.lock" }}
       - run:
           name: Avoid hosts unknown for github
-          command:
-            mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking
-            no\n" > ~/.ssh/config
-      - run: git config --global user.email "danny.ri.brown+ohif-bot@gmail.com"
-      - run: git config --global user.name "ohif-bot"
+          command: |
+            rm -rf ~/.ssh
+            mkdir ~/.ssh/
+            echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
+            git config --global user.email "danny.ri.brown+ohif-bot@gmail.com"
+            git config --global user.name "ohif-bot"
       - run:
-          name: Authenticate with registry
+          name: Authenticate with NPM registry
           command:
             echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
       - run: npx lerna version
       - run: npx lerna publish from-package
-
-      # Persist :+1:
       - persist_to_workspace:
           root: ~/repo
           paths: .