Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-10-17 12:51:09 +0300
committerJacob Vosmaer <jacob@gitlab.com>2017-10-17 13:57:17 +0300
commit463e37236c8df0842a1e9b12c187225f77635f10 (patch)
treef6f7156675726a658c612968a74a957f5852cf62
parentcf0e767a98b9e4203e85feeb06b095ae38ab6ba4 (diff)
Always run 'bundle config --path'always-bundle-config
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f32cd684f..086d43dd7 100644
--- a/Makefile
+++ b/Makefile
@@ -54,8 +54,9 @@ build: .ruby-bundle $(TARGET_SETUP)
go install $(GO_LDFLAGS) $(COMMAND_PACKAGES)
cp $(foreach cmd,$(COMMANDS),$(BIN_BUILD_DIR)/$(cmd)) $(BUILD_DIR)/
+BUNDLE_PATH ?= vendor/bundle
.ruby-bundle: ruby/Gemfile.lock ruby/Gemfile
- if test -z "${BUNDLE_PATH}" ; then cd ruby && bundle config --local path vendor/bundle; fi
+ cd ruby && bundle config --local path ${BUNDLE_PATH}
cd ruby && bundle install
touch $@