diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2022-06-28 10:56:06 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2022-07-15 11:16:43 +0300 |
| commit | 1ba0ce586beca2a7fd69672927c2c0d3c88bef1a (patch) | |
| tree | f0533729f8775e1d3369c26313ca3b046dba25b3 | |
| parent | 554ccd52e2290ebc697d3029c7b45d112f37ce42 (diff) | |
Hardcode module version in git2go binary name variable
git2go package is dynamically adding the module version to the
BinaryName variable. Only production build contains the module
version though, leading the test builds to have the binary name as
'gitaly-git2go-'. This makes it more difficult to centralize the
binary location resolving as we'd have to differentiate this case.
For now, let's just hard code the v15 suffix to the variable. We
can soon drop the suffix entirely when the backwards compatibility
concerns are dealt with by pinning the auxiliary binaries a given
Gitaly can invoke.
| -rw-r--r-- | internal/git2go/executor.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/internal/git2go/executor.go b/internal/git2go/executor.go index 5007b6c6f..6256a9e74 100644 --- a/internal/git2go/executor.go +++ b/internal/git2go/executor.go @@ -19,7 +19,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/storage" glog "gitlab.com/gitlab-org/gitaly/v15/internal/log" "gitlab.com/gitlab-org/gitaly/v15/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/v15/internal/version" "gitlab.com/gitlab-org/labkit/correlation" ) @@ -28,7 +27,7 @@ var ( ErrInvalidArgument = errors.New("invalid parameters") // BinaryName is a binary name with version suffix . - BinaryName = "gitaly-git2go-" + version.GetModuleVersion() + BinaryName = "gitaly-git2go-v15" ) // Executor executes gitaly-git2go. |