Commit b4f9e18e authored by Stan Hu's avatar Stan Hu

Merge branch 'fix-gitaly-install-gem-home' into 'master'

Bundler 2.1.4 requires to use GEM_HOME

See merge request gitlab-org/gitlab!47134
parents 64f9a8df 1fc1357a
...@@ -22,7 +22,7 @@ Usage: rake "gitlab:gitaly:install[/installation/dir,/storage/path]") ...@@ -22,7 +22,7 @@ Usage: rake "gitlab:gitaly:install[/installation/dir,/storage/path]")
if Rails.env.test? if Rails.env.test?
command.push( command.push(
'BUNDLE_FLAGS=--no-deployment', 'BUNDLE_FLAGS=--no-deployment',
"BUNDLE_PATH=#{Bundler.bundle_path}") "GEM_HOME=#{Bundler.bundle_path}")
end end
storage_paths = { 'default' => args.storage_path } storage_paths = { 'default' => args.storage_path }
......
...@@ -89,7 +89,7 @@ RSpec.describe 'gitlab:gitaly namespace rake task' do ...@@ -89,7 +89,7 @@ RSpec.describe 'gitlab:gitaly namespace rake task' do
let(:command) do let(:command) do
%W[make %W[make
BUNDLE_FLAGS=--no-deployment BUNDLE_FLAGS=--no-deployment
BUNDLE_PATH=#{Bundler.bundle_path}] GEM_HOME=#{Bundler.bundle_path}]
end end
before do before do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment