From 3f52ea5bd17cc829edc5615b5e84f62f2f130053 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Mon, 10 Jul 2017 23:48:27 +0900
Subject: Bump knapsack to 1.14.0

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

(limited to 'scripts')

diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index 03de59f27ad..9edea404461 100644
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -8,9 +8,10 @@ if [ "$USE_BUNDLE_INSTALL" != "false" ]; then
     bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check
 fi
 
-# Only install knapsack after bundle install! Otherwise oddly some native
+# Only install fog-aws/mime-types after bundle install! Otherwise oddly some native
 # gems could not be found under some circumstance. No idea why, hours wasted.
-retry gem install knapsack fog-aws mime-types
+# TODO: remove workaround on !10156
+retry gem install fog-aws mime-types
 
 cp config/resque.yml.example config/resque.yml
 sed -i 's/localhost/redis/g' config/resque.yml
-- 
cgit v1.2.1