diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 12:08:38 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 12:08:38 +0000 |
commit | 5ad0cf26551baff8f08af8562a8d45e6ec14d71a (patch) | |
tree | 57f1a6bad31bcd11efacd3fdfb9cc92f88fb6a86 /doc/development | |
parent | f47c768fad17d4c876e96524f83f8306f071db66 (diff) | |
download | gitlab-ce-5ad0cf26551baff8f08af8562a8d45e6ec14d71a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development')
-rw-r--r-- | doc/development/gitaly.md | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/doc/development/gitaly.md b/doc/development/gitaly.md index 20bba134ef1..3c18b3587c6 100644 --- a/doc/development/gitaly.md +++ b/doc/development/gitaly.md @@ -167,8 +167,15 @@ end Normally, GitLab CE/EE tests use a local clone of Gitaly in `tmp/tests/gitaly` pinned at the version specified in `GITALY_SERVER_VERSION`. The `GITALY_SERVER_VERSION` file supports also -branches and SHA to use a custom commit in <https://gitlab.com/gitlab-org/gitaly>. If -you want to run tests locally against a modified version of Gitaly you +branches and SHA to use a custom commit in <https://gitlab.com/gitlab-org/gitaly>. + +NOTE: **Note:** +With the introduction of auto-deploy for Gitaly, the format of +`GITALY_SERVER_VERSION` was aligned with Omnibus syntax. +It no longer supports `=revision`, it will evaluate the file content as a Git +reference (branch or SHA), only if it matches a semver it will prepend a `v`. + +If you want to run tests locally against a modified version of Gitaly you can replace `tmp/tests/gitaly` with a symlink. This is much faster because if will avoid a Gitaly re-install each time you run `rspec`. @@ -185,8 +192,7 @@ to manually run `make` again. Note that CI tests will not use your locally modified version of Gitaly. To use a custom Gitaly version in CI you need to update -GITALY_SERVER_VERSION. You can use the format `=revision` to use a -non-tagged commit from <https://gitlab.com/gitlab-org/gitaly> in CI. +GITALY_SERVER_VERSION as described at the beginning of this paragraph. To use a different Gitaly repository, e.g., if your changes are present on a fork, you can specify a `GITALY_REPO_URL` environment variable when |