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.

Sign up for GitHub

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

Update travis CI adding latest Ruby and JRuby versions; fix failure on JRuby 9.2 #733

Merged
merged 3 commits into from
Jul 6, 2018
Merged

Update travis CI adding latest Ruby and JRuby versions; fix failure on JRuby 9.2 #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40446ba
Add latest JRuby versions (9.1.17.0 & 9.2.0.0) to travis CI config
ivoanjo Jun 23, 2018
d188f83
Add ruby-2.6.0-preview2 to travis CI config
ivoanjo Jun 23, 2018
cb4cded
Workaround struct inspect bug on JRuby 9.2.0.0
ivoanjo Jul 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: ruby
rvm:
# start with the latest
- 2.5.1
- jruby-9.1.17.0
- jruby-9.2.0.0

# older versions
- 2.4.4
Expand All @@ -13,10 +13,12 @@ rvm:
- 2.0.0
- 1.9.3

- jruby-9.1.17.0
- jruby-9.0.5.0
- jruby-1.7.27

- ruby-head
- ruby-2.6.0-preview2
Copy link
Member

Choose a reason for hiding this comment

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

please add it to allowed failure

- jruby-head

- rbx-3
Expand All @@ -41,6 +43,7 @@ matrix:
- rvm: jruby-head
- rvm: 1.9.3
- rvm: rbx-3
- rvm: ruby-2.6.0-preview2

env:
global:
Expand Down
2 changes: 1 addition & 1 deletion lib/concurrent/synchronization/abstract_struct.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def ns_merge(other, &block)

# @!visibility private
def pr_underscore(clazz)
word = clazz.to_s
word = clazz.to_s.dup # dup string to workaround JRuby 9.2.0.0 bug https://github.com/jruby/jruby/issues/5229
word.gsub!(/::/, '/')
word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
Expand Down