diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-02 11:39:16 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-02 19:02:01 +0200 |
| commit | 6a29d3a4875fa25bfe3ea0a8afb747cb7708e6a1 (patch) | |
| tree | 1514905cecc0f7f9914a80f168242264471d37ab /lib/tasks | |
| parent | 88958e5a9cd364ae36f3d2837982cedb9239c3bc (diff) | |
| download | gitlab-ce-6a29d3a4875fa25bfe3ea0a8afb747cb7708e6a1.tar.gz | |
Ensure we run installation Rake tasks in a clean env in TestEnv
If we call `system('rake', 'taks_name')`, `ENV['RUBYOPT']` is set to
`'-rbundler/setup'` but some tasks (e.g. `gitlab:gitaly:install` need
a clean env since they install their own Gem bundle.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake index 680e76af471..3703f9cfb5c 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 BUNDLE_GEMFILE] + [command]) } + Bundler.with_original_env { run_command!([command]) } end end end |