From 4d467395b94761a39ed2e8ebe736870d6c8f2aaf Mon Sep 17 00:00:00 2001
From: Mike <mike@madebymike.com.au>
Date: Tue, 14 Jan 2020 10:12:16 +1100
Subject: [PATCH 1/2] Update config.yml

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7b880c6c4aa..61f08ef6bfd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,6 +64,9 @@ x-integration-steps: &integration-steps
 x-simple-tests: &simple-tests
   steps:
     - checkout
+    - run: yarn lint:eslint --format junit -o reports/junit/js-lint-results.xml
+    - run: yarn lint:prettier
+    - run: yarn lint:markdown
     - run:
         name: 'Is test required'
         command: node ./.circleci/run-or-bail.js
@@ -78,9 +81,6 @@ x-simple-tests: &simple-tests
     - run: CYPRESS_CACHE_FOLDER=$CIRCLE_WORKING_DIRECTORY/node_modules/cypress/.cache/ yarn
     - save_cache: *save-cache
     # run tests!
-    - run: yarn lint:eslint --format junit -o reports/junit/js-lint-results.xml
-    - run: yarn lint:prettier
-    - run: yarn lint:markdown
     - run:
         name: Unit tests
         command: yarn jest --ci --reporters=default --reporters=jest-junit --maxWorkers=1

From 1e9395a8db08b89b0d31aa6064fdf1f2ea715a64 Mon Sep 17 00:00:00 2001
From: Mike <mike@madebymike.com.au>
Date: Tue, 14 Jan 2020 10:32:25 +1100
Subject: [PATCH 2/2] Update config.yml

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 61f08ef6bfd..b67f2a1c742 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,13 +31,13 @@ x-save-cache: &save-cache
 x-integration-steps: &integration-steps
   steps:
     - checkout
-    - run:
-        name: 'Is test required'
-        command: node ./.circleci/run-or-bail.js
     - run:
         name: Yarn - Install packages
         command: CYPRESS_CACHE_FOLDER=$CIRCLE_WORKING_DIRECTORY/node_modules/cypress/.cache/ yarn
     - save_cache: *save-cache
+    - run:
+        name: 'Is test required'
+        command: node ./.circleci/run-or-bail.js
     - run:
         name: E2E Cypress tests
         command: CYPRESS_CACHE_FOLDER=$CIRCLE_WORKING_DIRECTORY/node_modules/cypress/.cache/ yarn --cwd $PROJECT_DIRECTORY cypress:run:ci
@@ -64,6 +64,11 @@ x-integration-steps: &integration-steps
 x-simple-tests: &simple-tests
   steps:
     - checkout
+    # Set Cypress cache dir here, in case this job runs/completes first, and
+    # hence clobbers the `node_modules` cache with a non-cypress version,
+    # causing the other job to fail with a "Missing Cypress" error.
+    - run: CYPRESS_CACHE_FOLDER=$CIRCLE_WORKING_DIRECTORY/node_modules/cypress/.cache/ yarn
+    - save_cache: *save-cache
     - run: yarn lint:eslint --format junit -o reports/junit/js-lint-results.xml
     - run: yarn lint:prettier
     - run: yarn lint:markdown
@@ -75,11 +80,6 @@ x-simple-tests: &simple-tests
     - run: psql -d $TEST_DATABASE_URL -c "CREATE SCHEMA keystone;"
     - run: psql -d $TEST_DATABASE_URL -c "CREATE USER keystone5 PASSWORD 'k3yst0n3';"
     - run: psql -d $TEST_DATABASE_URL -c "GRANT ALL ON SCHEMA keystone TO keystone5;"
-    # Set Cypress cache dir here, in case this job runs/completes first, and
-    # hence clobbers the `node_modules` cache with a non-cypress version,
-    # causing the other job to fail with a "Missing Cypress" error.
-    - run: CYPRESS_CACHE_FOLDER=$CIRCLE_WORKING_DIRECTORY/node_modules/cypress/.cache/ yarn
-    - save_cache: *save-cache
     # run tests!
     - run:
         name: Unit tests