diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2017-08-07 09:46:27 +0300 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-08-07 18:43:11 +0300 |
| commit | c1d52714fbb490f74c5ab9d5d53628375da84bd8 (patch) | |
| tree | 0338c39f7ffeb273fdc72ed84341e993bf3de316 | |
| parent | 4be20e07c4aaa10ca79b480b83c3a5c1f84a3600 (diff) | |
Use BUNDLE_PATH instead of --path for gitaly-ruby
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | Makefile | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a4e8111aa..06f1cec72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ UNRELEASED +- Use BUNDLE_PATH instead of --path for gitaly-ruby + https://gitlab.com/gitlab-org/gitaly/merge_requests/271 - Add GitLab-Shell Path to config https://gitlab.com/gitlab-org/gitaly/merge_requests/267 - Don't count on PID 1 to be the reaper @@ -10,6 +10,7 @@ TEST_REPO := $(TEST_REPO_STORAGE_PATH)/gitlab-test.git INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/ COVERAGE_DIR := $(TARGET_DIR)/cover export GITALY_TEST_RUBY_DIR := $(BUILD_DIR)/ruby +export BUNDLE_PATH := vendor/bundle BUILDTIME = $(shell date -u +%Y%m%d.%H%M%S) VERSION_PREFIXED = $(shell git describe) @@ -48,7 +49,7 @@ build: .ruby-bundle $(TARGET_SETUP) cp $(foreach cmd,$(COMMANDS),$(BIN_BUILD_DIR)/$(cmd)) $(BUILD_DIR)/ .ruby-bundle: ruby/Gemfile.lock - cd ruby && bundle install --path vendor/bundle + cd ruby && bundle install touch $@ .PHONY: install |