diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-31 14:22:43 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-01-31 17:49:39 +0100 |
| commit | 2517e138ca2f13020841b5809734eb5bd89c5228 (patch) | |
| tree | 6ab63afa7da9b7e0b68cd7f8a33e8e0673cdcef9 | |
| parent | 0cf34d4d6d350ae6987da2260e0824bf91e752ed (diff) | |
| download | gitlab-ce-gitaly-ruby-isolation-failure-2.tar.gz | |
Don't install gitaly-ruby gems in the top-level vendor/ to ensure gitlay-ruby gems are isolatedgitaly-ruby-isolation-failure-2
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rwxr-xr-x | scripts/gitaly-test-build | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/gitaly-test-build b/scripts/gitaly-test-build index b42ae2a2595..251c3debeb2 100755 --- a/scripts/gitaly-test-build +++ b/scripts/gitaly-test-build @@ -11,14 +11,9 @@ require 'fileutils' tmp_tests_gitaly_dir = File.expand_path('../tmp/tests/gitaly', __dir__) -# Use the top-level bundle vendor folder so that we don't reinstall gems twice -bundle_vendor_path = File.expand_path('../vendor', __dir__) - env = { - # This ensure the `clean` config set in `scripts/prepare_build.sh` isn't taken into account - 'BUNDLE_IGNORE_CONFIG' => 'true', 'BUNDLE_GEMFILE' => File.join(tmp_tests_gitaly_dir, 'ruby', 'Gemfile'), - 'BUNDLE_FLAGS' => "--jobs=4 --path=#{bundle_vendor_path} --retry=3" + 'BUNDLE_FLAGS' => "--jobs=4 --path=vendor --retry=3" } abort 'gitaly build failed' unless system(env, 'make', chdir: tmp_tests_gitaly_dir) |