Skip to content
Permalink
Browse files
Merge branch 'master' into truffle-head
Conflicts:
	core/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java
	core/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java
	core/src/main/java/org/jruby/truffle/nodes/core/FixnumOrBignumNode.java
	core/src/main/java/org/jruby/truffle/nodes/core/MathNodes.java
	core/src/main/java/org/jruby/truffle/nodes/objects/ReadInstanceVariableNode.java
	core/src/main/java/org/jruby/truffle/runtime/core/RubyRegexp.java
  • Loading branch information
chrisseaton committed Nov 29, 2014
2 parents 4eb2a21 + fd5a2c6 commit fa4c76b187af76f16990624c678e792458ef0495
Showing 263 changed files with 7,731 additions and 4,220 deletions.
@@ -17,7 +17,6 @@ env:
- JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
matrix:
- PHASE='-Ptest'
- PHASE='-Pjruby_complete_jar_jruby'
- PHASE='-Prake -Dtask=test:jruby'
- PHASE='-Prake -Dtask=test:mri'
- PHASE='-Prake -Dtask=test:slow_suites'
@@ -51,18 +50,16 @@ matrix:
- env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
jdk: oraclejdk7
- env: PHASE='-Pmain,test -Dinvoker.test=extended'
jdk: openjdk7
- env: PHASE='-Pjruby_complete_jar_extended -Dinvoker.skip=true'
jdk: oraclejdk8
- env: COMMAND=test/check_versions.sh
jdk: oraclejdk8
fast_finish: true
allow_failures:
- env: PHASE='-Pcomplete'
- env: PHASE='-Prake -Dtask=spec:jrubyc'
- env: PHASE='-Pjruby_complete_jar_extended'
- env: PHASE='-Prake -Dtask=spec:profiler'
- env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
- env: PHASE='-Pmain,test -Dinvoker.test=extended'
- env: PHASE='-Pj2ee'

branches:
only:
@@ -73,7 +70,7 @@ branches:
before_install:
- if [[ $TRAVIS_JDK_VERSION = 'oraclejdk8' ]]; then sudo apt-get update; sudo apt-get install oracle-java8-installer; else true; fi

script: if [[ -v COMMAND ]]; then $COMMAND; else travis_retry mvn -q -Pbootstrap clean package ; mvn install $PHASE -Dinvoker.skip=false | egrep -v 'Download|\\[exec\\] [[:digit:]]+/[[:digit:]]+|^[[:space:]]*\\[exec\\][[:space:]]*$' ; [ ${PIPESTATUS[0]} == 0 ]; fi
script: if [[ -v COMMAND ]]; then $COMMAND; else travis_retry mvn -q -Pbootstrap clean package ; mvn install -Dinvoker.skip=false $PHASE | egrep -v 'Download|\\[exec\\] [[:digit:]]+/[[:digit:]]+|^[[:space:]]*\\[exec\\][[:space:]]*$' ; [ ${PIPESTATUS[0]} == 0 ]; fi
install: /bin/true
notifications:
irc:
@@ -258,7 +258,7 @@
end


[ :osgi, :dist, :'jruby-jars', :main, :all, :complete, :release, :snapshots ].each do |name|
[ :osgi, :dist, :'jruby-jars', :main, :all, :complete, :release, :jruby_complete_jar_extended ].each do |name|
profile name do
plugin :shade do
execute_goals( 'shade',
@@ -950,7 +950,7 @@
</build>
</profile>
<profile>
<id>snapshots</id>
<id>jruby_complete_jar_extended</id>
<build>
<plugins>
<plugin>

0 comments on commit fa4c76b

Please sign in to comment.