diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 12:09:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 12:09:15 +0300 |
| commit | d89b82481b3ee5a226bab905555dd9c6a4708521 (patch) | |
| tree | d10aa55e4ad8a6404f4e02d53b9f3f96a0c99fa7 /scripts/gitaly-test-build | |
| parent | 430aebe8afe80c67d1bafcc5c68cd28e5f207639 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/gitaly-test-build')
| -rwxr-xr-x | scripts/gitaly-test-build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/gitaly-test-build b/scripts/gitaly-test-build index 849c08df527..d6b818595f0 100755 --- a/scripts/gitaly-test-build +++ b/scripts/gitaly-test-build @@ -3,14 +3,14 @@ require 'fileutils' -require_relative 'gitaly_test' +require_relative '../spec/support/helpers/gitaly_setup' # This script assumes tmp/tests/gitaly already contains the correct # Gitaly version. We just have to compile it and run its 'bundle # install'. We have this separate script for that to avoid bundle # poisoning in CI. This script should only be run in CI. class GitalyTestBuild - include GitalyTest + include GitalySetup def run set_bundler_config |