diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /scripts/gitaly-test-build | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'scripts/gitaly-test-build')
-rwxr-xr-x | scripts/gitaly-test-build | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/gitaly-test-build b/scripts/gitaly-test-build index 4890e6912cd..e6afadccc7e 100755 --- a/scripts/gitaly-test-build +++ b/scripts/gitaly-test-build @@ -15,7 +15,14 @@ class GitalyTestBuild def run set_bundler_config - abort 'gitaly build failed' unless build_gitaly + # If we have the binaries from the cache, we can skip building them again + if File.exist?(tmp_tests_gitaly_bin_dir) + GitalySetup::LOGGER.debug "Gitaly binary already built. Skip building...\n" + # We still need to install the gems in that case + install_gitaly_gems + else + abort 'gitaly build failed' unless build_gitaly + end ensure_gitlab_shell_secret! check_gitaly_config! |