Skip to content

Commit c01a275

Browse files
authored
Merge pull request #733 from ivoanjo/update-travis-config
Update travis CI adding latest Ruby and JRuby versions; fix failure on JRuby 9.2
2 parents 5610226 + cb4cded commit c01a275

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: ruby
33
rvm:
44
# start with the latest
55
- 2.5.1
6-
- jruby-9.1.17.0
6+
- jruby-9.2.0.0
77

88
# older versions
99
- 2.4.4
@@ -13,10 +13,12 @@ rvm:
1313
- 2.0.0
1414
- 1.9.3
1515

16+
- jruby-9.1.17.0
1617
- jruby-9.0.5.0
1718
- jruby-1.7.27
1819

1920
- ruby-head
21+
- ruby-2.6.0-preview2
2022
- jruby-head
2123

2224
- rbx-3
@@ -41,6 +43,7 @@ matrix:
4143
- rvm: jruby-head
4244
- rvm: 1.9.3
4345
- rvm: rbx-3
46+
- rvm: ruby-2.6.0-preview2
4447

4548
env:
4649
global:

lib/concurrent/synchronization/abstract_struct.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def ns_merge(other, &block)
117117

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

0 commit comments

Comments
 (0)