diff options
author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-04-25 15:04:04 +0300 |
---|---|---|
committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-04-25 15:07:50 +0300 |
commit | b97d63a6b353018515f04dc424137145b5e7db62 (patch) | |
tree | 69777d3165a86d1ecd3be413c6438ec29972eeb0 | |
parent | f57a981311cf48840ffdc14dce1743e7e3cf0768 (diff) |
rspec: Convert test repo helper to use newer bundled Git version
The test repository helper in our rspecs is used to create temporary
repositories for testing purposes. The Git version it uses for this
purpose depends on a set of environment variables, but in case it runs
with bundled Git it needs to some more bootstrapping of an execution
environment in order to be able to properly clone the repository.
The bundled Git version is currently hard-coded to `gitaly-git`, which
we're about to phase out in favor of `gitaly-git-v2.35.1.gl1`. With the
removal of the old version the helper is thus about to break.
Fix this by switching over to the newer bundled Git version. While we
could do fancy things like injecting the version or auto-detecting it,
it doesn't really feel worth it over simply hard-coding it. We're
ultimately going to retire the sidecar over the next few releases, so we
shouldn't spend more time than necessary on maintaining it.
-rw-r--r-- | ruby/spec/test_repo_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby/spec/test_repo_helper.rb b/ruby/spec/test_repo_helper.rb index 91f46dc30..4d0e321dc 100644 --- a/ruby/spec/test_repo_helper.rb +++ b/ruby/spec/test_repo_helper.rb @@ -9,7 +9,7 @@ require 'gitaly' if ENV.key?('GITALY_TESTING_GIT_BINARY') GIT_BINARY_PATH = ENV['GITALY_TESTING_GIT_BINARY'] elsif ENV.key?('GITALY_TESTING_BUNDLED_GIT_PATH') - GIT_BINARY_PATH = File.join(ENV['GITALY_TESTING_BUNDLED_GIT_PATH'], 'gitaly-git') + GIT_BINARY_PATH = File.join(ENV['GITALY_TESTING_BUNDLED_GIT_PATH'], 'gitaly-git-v2.35.1.gl1') GIT_EXEC_PATH = File.join(TMP_DIR, 'git-exec-path') # We execute git-clone(1) to set up the test repo, and this requires Git to |