Skip to content
Snippets Groups Projects
Commit 1631ad02 authored by Jacob Vosmaer (GitLab)'s avatar Jacob Vosmaer (GitLab)
Browse files

Support the fact that Gitaly uses bundler

parent 0ed42f4b
No related branches found
No related tags found
No related merge requests found
Loading
@@ -19,7 +19,7 @@ namespace :gitlab do
Loading
@@ -19,7 +19,7 @@ namespace :gitlab do
   
Dir.chdir(args.dir) do Dir.chdir(args.dir) do
create_gitaly_configuration create_gitaly_configuration
run_command!([command]) Bundler.with_original_env { run_command!([command]) }
end end
end end
   
Loading
Loading
Loading
@@ -146,7 +146,7 @@ module TestEnv
Loading
@@ -146,7 +146,7 @@ module TestEnv
gitaly_exec = File.join(gitaly_dir, 'gitaly') gitaly_exec = File.join(gitaly_dir, 'gitaly')
gitaly_config = File.join(gitaly_dir, 'config.toml') gitaly_config = File.join(gitaly_dir, 'config.toml')
log_file = Rails.root.join('log/gitaly-test.log').to_s log_file = Rails.root.join('log/gitaly-test.log').to_s
@gitaly_pid = spawn(gitaly_exec, gitaly_config, [:out, :err] => log_file) @gitaly_pid = Bundler.with_original_env { spawn(gitaly_exec, gitaly_config, [:out, :err] => log_file) }
end end
   
def stop_gitaly def stop_gitaly
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment