summaryrefslogtreecommitdiff
path: root/scripts/gitaly-test-build
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/gitaly-test-build')
-rwxr-xr-xscripts/gitaly-test-build6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/gitaly-test-build b/scripts/gitaly-test-build
index 251c3debeb2..48bf2f96ac7 100755
--- a/scripts/gitaly-test-build
+++ b/scripts/gitaly-test-build
@@ -10,10 +10,12 @@ require 'fileutils'
# gitlab-ce and gitaly.
tmp_tests_gitaly_dir = File.expand_path('../tmp/tests/gitaly', __dir__)
+gitaly_ruby_gemfile_path = File.join(tmp_tests_gitaly_dir, 'ruby', 'Gemfile'),
+gitaly_ruby_bundle_path = File.join(tmp_tests_gitaly_dir, 'ruby', 'vendor'),
env = {
- 'BUNDLE_GEMFILE' => File.join(tmp_tests_gitaly_dir, 'ruby', 'Gemfile'),
- 'BUNDLE_FLAGS' => "--jobs=4 --path=vendor --retry=3"
+ 'BUNDLE_GEMFILE' => gitaly_ruby_gemfile_path,
+ 'BUNDLE_FLAGS' => "--jobs=4 --path=#{gitaly_ruby_bundle_path} --retry=3"
}
abort 'gitaly build failed' unless system(env, 'make', chdir: tmp_tests_gitaly_dir)