diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-10-06 15:41:48 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-10-11 10:07:42 +0300 |
| commit | 57a2d68965fb55d8329d8f99eacfebc0c335682a (patch) | |
| tree | 7052fdb1b55a3c8142bb7e49089067dbb4c6dbad | |
| parent | da80cfaefc223dd1e701f93dc2e0631a27d88fab (diff) | |
test-boot: Set up Git binary path
We use the test-boot script to determine whether the Gitaly server
successfully boots up with a given Gitaly configuration. This config
currently not contain the path to the Git binary though, which is why it
will instead pick up the system-provided Git binary. This wouldn't
typically be the correct version though, given that we'd likely want to
boot Gitaly with the Git executable produced by `make git`. The result
is that Gitaly would refuse to boot if the system-provided version of
Git does not meet the minimum required version.
Fix the issue by setting the Git binary path.
| -rwxr-xr-x | _support/test-boot | 7 |
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" |