diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-04-18 08:37:30 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-04-18 08:37:30 +0300 |
| commit | 4a49e0cc740b94bd127840840b16add8b371035d (patch) | |
| tree | f92211355f30b3215604d26c6e1461b7168a56e4 | |
| parent | 69399ae8a177876028e2f9f8c41d937ff85cf71e (diff) | |
| parent | 400c2656d00bfbb0e208ef15097593776ae465c4 (diff) | |
Merge branch 'toon-no-moar-rspec' into 'master'
ruby: More cleaning up
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5621
Merged-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Reviewed-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Co-authored-by: Toon Claes <toon@gitlab.com>
| -rw-r--r-- | doc/configuration/README.md | 1 | ||||
| -rw-r--r-- | internal/git/execution_environment.go | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/configuration/README.md b/doc/configuration/README.md index 189be0701..6f3957e8f 100644 --- a/doc/configuration/README.md +++ b/doc/configuration/README.md @@ -144,7 +144,6 @@ level = "warn" | `level` | string | no | Log level: `debug`, `info`, `warn`, `error`, `fatal`, or `panic`. Default: `info` | | `sentry_dsn` | string | no | Sentry DSN for exception monitoring | | `sentry_environment` | string | no | Sentry Environment for exception monitoring | -| `ruby_sentry_dsn` | string | no | Sentry DSN for `gitaly-ruby` exception monitoring | #### Environment variables diff --git a/internal/git/execution_environment.go b/internal/git/execution_environment.go index 5a6b092ea..17344ddce 100644 --- a/internal/git/execution_environment.go +++ b/internal/git/execution_environment.go @@ -155,10 +155,11 @@ func (c BundledGitEnvironmentConstructor) Construct(cfg config.Cfg) (_ Execution } if err := os.Symlink(bundledGitBinary, filepath.Join(cfg.BinDir, binary)); err != nil { - // While Gitaly's Go tests use a temporary binary directory, Ruby - // rspecs set up the binary directory to point to our build - // directory. They thus already contain the Git binaries and don't - // need symlinking. + // Multiple Git command factories might be created for the same configuration. + // Each of them will create the execution environment every time, + // therefore these symlinks might already exist. + // It would be nice if we could fix this, but gracefully handling the error is a + // more boring solution. if errors.Is(err, os.ErrExist) { continue } |