From a5cec3ddccfc5f8cd4256a20099d960fdabcc507 Mon Sep 17 00:00:00 2001
From: ndrg13 <72130242+ndrg13@users.noreply.github.com>
Date: Thu, 5 Nov 2020 15:45:11 +0100
Subject: [PATCH] Update config.yml

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0af9502..d6acfa0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,18 +11,14 @@ jobs:
     executor: my-executor
     steps:
       - checkout
-      - restore_cache:
-          name: Restore Yarn package cache
-          keys: 
-            - npm-v2-dependencies-{{ checksum "yarn.lock" }}
       - run:
           name: Install dependencies
           command: yarn global add node-gyp && yarn install
       - save_cache:
           name: Save Yarn package cache
-          key: npm-v2-dependencies-{{ checksum "yarn.lock" }}
+          key: npm-v3-dependencies-{{ checksum "yarn.lock" }}
           paths:
-            - ~/.cache/yarn2
+            - ~/.cache/yarn3
   lint:
     executor: my-executor
     steps:
@@ -30,13 +26,10 @@ jobs:
       - restore_cache:
           name: Restore Yarn package cache
           keys: 
-            - npm-v2-dependencies-{{ checksum "yarn.lock" }}
+            - npm-v3-dependencies-{{ checksum "yarn.lock" }}
       - run:
-          name: Analyse code with tslint
-          command: yarn lint
-      - run:
-          name: Format code with prettier
-          command: yarn format:check
+          name: Analyse code with tslint and format with prettier
+          command: yarn lint && yarn format:check 
   test:
     executor: my-executor
     steps:
@@ -44,7 +37,7 @@ jobs:
       - restore_cache:
           name: Restore Yarn package cache
           keys: 
-            - npm-v2-dependencies-{{ checksum "yarn.lock" }}
+            - npm-v3-dependencies-{{ checksum "yarn.lock" }}
       - run:
           name: Run test with jest
           command: yarn test:ci
@@ -58,4 +51,4 @@ workflows:
             - build
       - test:
           requires:
-            - lint
+            - build