diff options
| author | Bundlerbot <bot@bundler.io> | 2019-12-31 09:14:50 +0000 |
|---|---|---|
| committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-01-01 20:52:53 +0100 |
| commit | 9cf51768dc5479bd274dbf6143ce3252d89a3ecb (patch) | |
| tree | f5982b7c6bad30eaa3800699c48e645e6328a5ba | |
| parent | 078c45e0660cbca8d0e4bbb06bbdb71f0364578c (diff) | |
| download | bundler-9cf51768dc5479bd274dbf6143ce3252d89a3ecb.tar.gz | |
Merge #7526
7526: Fix CI failure with mustermann 1.1.0 r=deivid-rodriguez a=kou
### What was the end-user problem that led to this PR?
This PR doesn't fix any end-user problem.
This PR fixes a developer problem. Our CI is failed with mustermann 1.1.0.
### What was your diagnosis of the problem?
This is caused because mustermann 1.1.0 starts depending on ruby2_keyword gem but our test script doesn't add a load path for ruby2_keyword gem yet.
See also:
* The PR that adds ruby2_keyword gem dependency to mustermann: https://github.com/sinatra/mustermann/pull/97
* Error message on CI: https://github.com/bundler/bundler/pull/7523#issuecomment-569736683
### What is your fix for the problem, implemented in this PR?
My fix adds a load path for ruby2_keywrod gem installed in `tmp/1/gems/`.
### Why did you choose this fix out of the possible options?
I don't have another option.
Co-authored-by: Sutou Kouhei <kou@clear-code.com>
(cherry picked from commit 984bef1771b63d174db68016fb4e135f0526ec5d)
| -rw-r--r-- | spec/support/artifice/endpoint.rb | 2 | ||||
| -rw-r--r-- | spec/support/artifice/endpoint_500.rb | 2 | ||||
| -rw-r--r-- | spec/support/artifice/windows.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/support/artifice/endpoint.rb b/spec/support/artifice/endpoint.rb index 7bca681e70..7f4cafc239 100644 --- a/spec/support/artifice/endpoint.rb +++ b/spec/support/artifice/endpoint.rb @@ -4,7 +4,7 @@ require_relative "../path" require Spec::Path.lib_dir.join("bundler/deprecate") include Spec::Path -$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra}-*/lib")].map(&:to_s)) +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s)) require "artifice" require "sinatra/base" diff --git a/spec/support/artifice/endpoint_500.rb b/spec/support/artifice/endpoint_500.rb index f98e7e3bc2..7c1c4365bb 100644 --- a/spec/support/artifice/endpoint_500.rb +++ b/spec/support/artifice/endpoint_500.rb @@ -3,7 +3,7 @@ require_relative "../path" include Spec::Path -$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra}-*/lib")].map(&:to_s)) +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s)) require "artifice" require "sinatra/base" diff --git a/spec/support/artifice/windows.rb b/spec/support/artifice/windows.rb index 21170c81d9..c31c6fff79 100644 --- a/spec/support/artifice/windows.rb +++ b/spec/support/artifice/windows.rb @@ -3,7 +3,7 @@ require_relative "../path" include Spec::Path -$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra}-*/lib")].map(&:to_s)) +$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gems.join("gems/{artifice,mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s)) require "artifice" require "sinatra/base" |