diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-01-24 01:21:57 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-01-26 21:24:57 +0800 |
| commit | ac3d56e0ffde27cdcf6515a9af4930324ebdf151 (patch) | |
| tree | 7f3d77072d1ba92de9322a3abda2c29c0dd9464a /lib | |
| parent | 4376be84ce18cde22febc50356ad254b507eef1b (diff) | |
| download | gitlab-ce-ac3d56e0ffde27cdcf6515a9af4930324ebdf151.tar.gz | |
Pass BUNDLE_PATH to install to the same path for test42290-pass-BUNDLE_PATH
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake index a2e68c0471b..aece8893974 100644 --- a/lib/tasks/gitlab/gitaly.rake +++ b/lib/tasks/gitlab/gitaly.rake @@ -21,7 +21,11 @@ namespace :gitlab do _, status = Gitlab::Popen.popen(%w[which gmake]) command << (status.zero? ? 'gmake' : 'make') - command << 'BUNDLE_FLAGS=--no-deployment' if Rails.env.test? + if Rails.env.test? + command.push( + 'BUNDLE_FLAGS=--no-deployment', + "BUNDLE_PATH=#{Bundler.bundle_path}") + end Gitlab::SetupHelper.create_gitaly_configuration(args.dir) Dir.chdir(args.dir) do |