Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/tasks/gitlab/gitaly.rake')
-rw-r--r--lib/tasks/gitlab/gitaly.rake13
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index e814d59aaf9..4c19d94f4a1 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -26,17 +26,8 @@ Usage: rake "gitlab:gitaly:install[/installation/dir,/storage/path]")
Gitlab::SetupHelper::Gitaly.create_configuration(args.dir, storage_paths)
Dir.chdir(args.dir) do
- Bundler.with_original_env do
- env = { "RUBYOPT" => nil, "BUNDLE_GEMFILE" => nil }
-
- if Rails.env.test?
- env["GEM_HOME"] = Bundler.bundle_path.to_s
- env["BUNDLE_DEPLOYMENT"] = 'false'
- end
-
- output, status = Gitlab::Popen.popen([make_cmd, 'clean-build', 'all'], nil, env)
- raise "Gitaly failed to compile: #{output}" unless status&.zero?
- end
+ output, status = Gitlab::Popen.popen([make_cmd, 'clean', 'all'])
+ raise "Gitaly failed to compile: #{output}" unless status&.zero?
end
end