Skip to content

For discussion: be explicit about JRuby opts #115

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

Merged
merged 3 commits into from
Feb 9, 2015
Merged

For discussion: be explicit about JRuby opts #115

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
a1ee2a8
Use same JRUBY_OPTS as on Travis CI if not set
bf4 Feb 9, 2015
bc0b976
Setting JRUBY_OPTS without cext.enabled or --2.0
bf4 Feb 9, 2015
4834dc7
JRuby doesn't have compile.mode property anymore
bf4 Feb 9, 2015
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
12 changes: 8 additions & 4 deletions travis/.travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,20 @@ rvm:
- 2.2
- ruby-head
- ree
- jruby-18mode
- jruby
- jruby-head
- rbx
matrix:
include:
- rvm: jruby
env: JRUBY_OPTS='--2.0'
env: JRUBY_OPTS='--server -Xcompile.invokedynamic=false -Xcompat.version=2.0'
- rvm: jruby-head
env: JRUBY_OPTS='--server -Xcompile.invokedynamic=false'
- rvm: jruby-18mode
env: JRUBY_OPTS='--server -Xcompile.invokedynamic=false'
- rvm: jruby
env: JRUBY_OPTS='--server -Xcompile.invokedynamic=false'
allow_failures:
- rvm: jruby-head
env: JRUBY_OPTS='--server -Xcompile.invokedynamic=false'
- rvm: ruby-head
- rvm: rbx
fast_finish: true
5 changes: 3 additions & 2 deletions travis/script/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $SCRIPT_DIR/travis_functions.sh
source $SCRIPT_DIR/predicate_functions.sh

# idea taken from: http://blog.headius.com/2010/03/jruby-startup-time-tips.html
export JRUBY_OPTS="${JRUBY_OPTS} -X-C" # disable JIT since these processes are so short lived
# If JRUBY_OPTS isn't set, use these.
# see http://docs.travis-ci.com/user/ci-environment/
export JRUBY_OPTS=${JRUBY_OPTS:-"--server -Xcompile.invokedynamic=false"}
SPECS_HAVE_RUN_FILE=specs.out
MAINTENANCE_BRANCH=`cat maintenance-branch`

Expand Down