diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-08 09:39:49 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-08 09:39:49 +0000 |
| commit | feb8974cc87455328dea708be556e41b59e8ba26 (patch) | |
| tree | b19b97094cd9296b049dcd2112cb9d1fd4e38edc /lib/tasks | |
| parent | 079df3121409198bcba232a1678125a6c83118de (diff) | |
| parent | 21937a157d435025d4ae0cf514fe7273302e1004 (diff) | |
| download | gitlab-ce-feb8974cc87455328dea708be556e41b59e8ba26.tar.gz | |
Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into 'master'
Unset the `RUBYOPT` env variable before installing `gitaly-ruby`
Closes #35941 and #35967
See merge request !13313
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 7d35e0df53a..aaf00bd703a 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!([command]) } + Bundler.with_original_env { run_command!(%w[/usr/bin/env -u RUBYOPT] + [command]) } end end end |