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

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x_support/test-boot7
1 files changed, 6 insertions, 1 deletions
diff --git a/_support/test-boot b/_support/test-boot
index 3c8638637..cf9b40ed5 100755
--- a/_support/test-boot
+++ b/_support/test-boot
@@ -7,7 +7,9 @@ ADDR = 'socket'.freeze
def main(gitaly_dir)
gitaly_dir = File.realpath(gitaly_dir)
- bin_dir = File.join(gitaly_dir, '_build', 'bin')
+ build_dir = File.join(gitaly_dir, '_build')
+ bin_dir = File.join(build_dir, 'bin')
+ git_path = File.join(build_dir, 'deps', 'git', 'install', 'bin', 'git')
version = IO.popen("#{File.join(bin_dir, 'gitaly')} -version").read.delete_prefix('Gitaly, version ').strip
version_from_file = IO.read(File.join(gitaly_dir, 'VERSION')).strip
@@ -29,6 +31,9 @@ def main(gitaly_dir)
name = "default"
path = "#{dir}"
+ [git]
+ bin_path = "#{git_path}"
+
[gitaly-ruby]
dir = "#{gitaly_dir}/ruby"