diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-02-01 19:11:26 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-02-01 19:11:26 +0100 |
| commit | 23b661f8e4ca5ff7e3174ded2dcc32869e3abeae (patch) | |
| tree | 01d3af773f9506a554d0eedf4ede34720befc2cc | |
| parent | 3a7c2586b91ad623dd6ac6ce4480783a0707bae6 (diff) | |
| download | gitlab-ce-42624-gitaly-bundle-isolation-not-working-in-ci.tar.gz | |
Set BUNDLE_PATH in scripts/gitaly-test-spawn42624-gitaly-bundle-isolation-not-working-in-ci
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rwxr-xr-x | scripts/gitaly-test-spawn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/gitaly-test-spawn b/scripts/gitaly-test-spawn index 6e19269c058..06c29cc4690 100755 --- a/scripts/gitaly-test-spawn +++ b/scripts/gitaly-test-spawn @@ -4,7 +4,7 @@ require 'rubygems' require 'bundler' gitaly_dir = 'tmp/tests/gitaly' -gitaly_ruby_bundle_path = File.expand_path(File.join('..', gitaly_dir, 'ruby/vendor/ruby/2.3.0'), __dir__) +gitaly_ruby_bundle_path = File.expand_path(File.join('..', gitaly_dir, 'ruby/vendor'), __dir__) puts "Gem.path: #{Gem.path.inspect}" puts "ENV['BUNDLE_GEMFILE']: #{ENV['BUNDLE_GEMFILE'].inspect}" @@ -37,7 +37,7 @@ end env = { 'HOME' => File.expand_path('tmp/tests'), - 'GEM_PATH' => gitaly_ruby_bundle_path + 'BUNDLE_PATH' => gitaly_ruby_bundle_path } puts "env:" |