Commit 1fc1357a authored by Kamil Trzciński's avatar Kamil Trzciński

Bundler 2.1.4 requires to use GEM_HOME

This fixes a shared gems storage for GitLab and Gitaly.
Prior to `2.1.x` we would use `BUNDLE_PATH`, but since
the new release, the bundler stores gems in `/ruby/<version>`
subfolder. The `.bundle_path` does return subfolder instead
of `BUNDLE_PATH` which causes problems with re-using gems storage.
parent 8a3e6935
...@@ -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