Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pin child-process on older J Ruby #1261

Merged
merged 1 commit into from
Feb 2, 2019
Merged

Pin child-process on older J Ruby #1261

merged 1 commit into from
Feb 2, 2019

Conversation

JonRowe
Copy link
Member

@JonRowe JonRowe commented Jan 31, 2019

No description provided.

@JonRowe JonRowe force-pushed the fix-jruby branch 3 times, most recently from 6b100d7 to 0b4372a Compare February 1, 2019 16:46
Copy link
Member

@benoittgt benoittgt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM @JonRowe

@JonRowe JonRowe merged commit fdc2280 into master Feb 2, 2019
@JonRowe JonRowe deleted the fix-jruby branch February 2, 2019 10:12
# allow gems to be installed on older rubies and/or windows
if RUBY_VERSION < '2.2.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
gem 'ffi', '< 1.10'
elsif RUBY_VERSION < '2.0.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I was thinking about this @JonRowe but shouldn't we start with the smaller version first?

if RUBY_VERSION < '2.0.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
  # ....
elsif RUBY_VERSION < '2.2.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
  # ....
elsif RUBY_VERSION < '1.9'
  # ....

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, seems like it wasn't needed though due to the builds passing? Want to remove the redundant part?

benoittgt pushed a commit to benoittgt/rspec-mocks that referenced this pull request May 18, 2019
JonRowe added a commit that referenced this pull request Jun 13, 2019
yujinakayama pushed a commit to yujinakayama/rspec-monorepo that referenced this pull request Oct 6, 2021
yujinakayama pushed a commit to yujinakayama/rspec-monorepo that referenced this pull request Oct 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants