From 3bb876885456b792e99d7531f153ba99793b7843 Mon Sep 17 00:00:00 2001
From: Dmitrii Celpan <celpand@gmail.com>
Date: Mon, 15 Oct 2018 23:31:23 +0300
Subject: [PATCH] Disable cache for carthage bootsrap in circleci job configs

It seems like the circleci is using cached dependencies that are compiled
with older version of swift. Hopefully disabling the cache builds and
forcing cartahge to rebuild dependencies with new swift version will
solve the problem.
---
 .circleci/config.yml           | 2 +-
 scripts/bootstrap-if-needed.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4e023a9ac..5be09c72b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,7 +30,7 @@ jobs:
           command: carthage checkout
       - run:
           name: Test Carthage Build before installing SwiftLint
-          command: carthage build --no-skip-current --cache-builds --no-use-binaries --verbose             
+          command: carthage build --no-skip-current --no-use-binaries --verbose
       - save_cache:
           key: v1-carthage-no-swiftlint-deps-{{ checksum "Cartfile.resolved" }}
           paths:
diff --git a/scripts/bootstrap-if-needed.sh b/scripts/bootstrap-if-needed.sh
index cd5236b3d..e08f03578 100755
--- a/scripts/bootstrap-if-needed.sh
+++ b/scripts/bootstrap-if-needed.sh
@@ -4,9 +4,9 @@ RED='\033[1;31m'
 GREEN='\033[1;32m'
 NC='\033[0m' # No Color
 
-if ! cmp -s Cartfile.resolved Carthage/Cartfile.resolved; then
+# if ! cmp -s Cartfile.resolved Carthage/Cartfile.resolved; then
   printf "${RED}Dependencies out of date with cache.${NC} Bootstrapping...\n"
   scripts/bootstrap.sh
-else
-  printf "${GREEN}Cache up-to-date.${NC} Skipping bootstrap...\n"
-fi
+# else
+#   printf "${GREEN}Cache up-to-date.${NC} Skipping bootstrap...\n"
+# fi