diff options
| author | Bundlerbot <bot@bundler.io> | 2019-09-05 23:56:32 +0000 |
|---|---|---|
| committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-09-15 09:42:47 +0200 |
| commit | 89f9c8be844359ea8d53f725aa7c7c2930900ddf (patch) | |
| tree | c59cc572b39d25907feb35be69379549ced23383 /lib | |
| parent | 3766053507348eb2b274adcdbc7fa8e02b2579a9 (diff) | |
| download | bundler-89f9c8be844359ea8d53f725aa7c7c2930900ddf.tar.gz | |
Merge #7344
7344: Backport the latest ruby core changes r=hsbt a=hsbt
### What was the end-user problem that led to this PR?
The master branch of Bundler with Ruby 2.7 fails some of tests.
### What was your diagnosis of the problem?
It caused by deprecation warnings of Ruby 2.7 and some environmental issues.
### What is your fix for the problem, implemented in this PR?
I fixed them.
* rspec examples of Bundler failed randomly on GitHub Actions of ruby/ruby. We fixed it on `spec_group.rb`
* `github_action_linux` label is no longer required. The current test suite is all green status with GitHub Actions.
* The keyword separation feature warns stub code under the `inline_spec.rb`. I ignore them.
### Why did you choose this fix out of the possible options?
Co-authored-by: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Co-authored-by: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
(cherry picked from commit cb5b0b6f43ceaee283c6cde084664c69f231e3fd)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/resolver/spec_group.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bundler/resolver/spec_group.rb b/lib/bundler/resolver/spec_group.rb index 119f63b5c8..e5772eed81 100644 --- a/lib/bundler/resolver/spec_group.rb +++ b/lib/bundler/resolver/spec_group.rb @@ -62,6 +62,7 @@ module Bundler end def eql?(other) + return unless other.is_a?(SpecGroup) name.eql?(other.name) && version.eql?(other.version) && source.eql?(other.source) |