Skip to content

Commit d504920

Browse files
committed
[travis-ci] the system call regression also relates to a Rails change in 4.2
1 parent c7763f3 commit d504920

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

.travis.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ matrix:
5151
gemfile: gemfiles/rails41.gemfile
5252
env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
5353
jdk: oraclejdk7
54-
# ``/system call symlink regression since JRuby 1.7.19
54+
# ``/system call symlink regression (since JRuby 1.7.19)
55+
# + (postgres) database_tasks got updated on 4.2 : https://github.com/rails/rails/commit/07f8a96aa14b642a86
5556
- rvm: jruby-1.7.24
5657
gemfile: gemfiles/rails42.gemfile
5758
env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=false INSERT_RETURNING=true
@@ -65,23 +66,6 @@ matrix:
6566
gemfile: gemfiles/rails42.gemfile
6667
env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
6768
include:
68-
# temporary due ``/system call symlink regression
69-
- rvm: jruby-1.7.18
70-
gemfile: gemfiles/rails42.gemfile
71-
env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=false INSERT_RETURNING=true
72-
jdk: oraclejdk7
73-
- rvm: jruby-1.7.18
74-
gemfile: gemfiles/rails42.gemfile
75-
env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
76-
jdk: oraclejdk7
77-
- rvm: jruby-1.7.18
78-
gemfile: gemfiles/rails42.gemfile
79-
env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
80-
jdk: oraclejdk7
81-
- rvm: jruby-1.7.18
82-
gemfile: gemfiles/rails42.gemfile
83-
env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
84-
jdk: oraclejdk7
8569
# testing against MariaDB
8670
- addons:
8771
mariadb: '5.5'

0 commit comments

Comments
 (0)