Skip to content

Commit

Permalink
Merge pull request #733 from ivoanjo/update-travis-config
Browse files Browse the repository at this point in the history
Update travis CI adding latest Ruby and JRuby versions; fix failure on JRuby 9.2
  • Loading branch information
pitr-ch committed Jul 6, 2018
2 parents 5610226 + cb4cded commit c01a275
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
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
- 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
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

0 comments on commit c01a275

Please sign in to comment.