diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-08-08 15:34:29 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-08-08 15:34:29 +0200 |
| commit | 5684528081d0ffef9f128cd1b102889f23075dd0 (patch) | |
| tree | 41ade8daf940e90c0c5143435856d52869a13946 | |
| parent | 5b08d59f07fc53c1e34819fac20352119d5343e6 (diff) | |
| download | gitlab-ce-5684528081d0ffef9f128cd1b102889f23075dd0.tar.gz | |
Unset BUNDLE_GEMFILE when installing Gitaly
| -rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 2 | ||||
| -rw-r--r-- | spec/tasks/gitlab/gitaly_rake_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake index aaf00bd703a..1f504485e4c 100644 --- a/lib/tasks/gitlab/gitaly.rake +++ b/lib/tasks/gitlab/gitaly.rake @@ -21,7 +21,7 @@ namespace :gitlab do create_gitaly_configuration # In CI we run scripts/gitaly-test-build instead of this command unless ENV['CI'].present? - Bundler.with_original_env { run_command!(%w[/usr/bin/env -u RUBYOPT] + [command]) } + Bundler.with_original_env { run_command!(%w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE] + [command]) } end end end diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb index cc932a4ec4c..871902a131b 100644 --- a/spec/tasks/gitlab/gitaly_rake_spec.rb +++ b/spec/tasks/gitlab/gitaly_rake_spec.rb @@ -41,7 +41,7 @@ describe 'gitlab:gitaly namespace rake task' do end describe 'gmake/make' do - let(:command_preamble) { %w[/usr/bin/env -u RUBYOPT] } + let(:command_preamble) { %w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE] } before(:all) do @old_env_ci = ENV.delete('CI') |