Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3207f90727a3
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6c9f58dd49ca
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 15, 2016

  1. Another one.

    headius committed Nov 15, 2016
    Copy the full SHA
    7d16c8a View commit details
  2. Shorten run.

    headius committed Nov 15, 2016
    Copy the full SHA
    6c9f58d View commit details
Showing with 42 additions and 41 deletions.
  1. +41 −41 .travis.yml
  2. +1 −0 test/mri/excludes/TestFileUtils.rb
82 changes: 41 additions & 41 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -29,52 +29,52 @@ env:
- JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xmn48M -Xmx512M"
- MALLOC_ARENA_MAX=2
matrix:
- PHASE='-Ptest'
- PHASE='-Prake -Dtask=test:jruby'
- PHASE='-Prake -Dtask=test:jruby:fullint'
- PHASE='-Prake -Dtask=test:jruby:jit'
# - PHASE='-Ptest'
# - PHASE='-Prake -Dtask=test:jruby'
# - PHASE='-Prake -Dtask=test:jruby:fullint'
# - PHASE='-Prake -Dtask=test:jruby:jit'
- PHASE='-Prake -Dtask=test:mri'
- PHASE='-Prake -Dtask=test:mri:fullint'
- PHASE='-Prake -Dtask=test:mri:jit'
- PHASE='-Prake -Dtask=test:slow_suites'
- PHASE='-Prake -Dtask=test:tracing'
- PHASE='-Prake -Dtask=spec:ji'
- PHASE='-Prake -Dtask=spec:compiler'
- PHASE='-Prake -Dtask=spec:compiler' JRUBY_OPTS=-Xcompile.invokedynamic
- PHASE='-Prake -Dtask=spec:ffi'
- PHASE='-Prake -Dtask=spec:regression'
- PHASE='-Prake -Dtask=spec:ruby:fast'
- PHASE='-Prake -Dtask=spec:jruby'
- PHASE='-Prake -Dtask=spec:jrubyc'
- PHASE='-Prake -Dtask=spec:profiler'
# - PHASE='-Prake -Dtask=test:mri:fullint'
# - PHASE='-Prake -Dtask=test:mri:jit'
# - PHASE='-Prake -Dtask=test:slow_suites'
# - PHASE='-Prake -Dtask=test:tracing'
# - PHASE='-Prake -Dtask=spec:ji'
# - PHASE='-Prake -Dtask=spec:compiler'
# - PHASE='-Prake -Dtask=spec:compiler' JRUBY_OPTS=-Xcompile.invokedynamic
# - PHASE='-Prake -Dtask=spec:ffi'
# - PHASE='-Prake -Dtask=spec:regression'
# - PHASE='-Prake -Dtask=spec:ruby:fast'
# - PHASE='-Prake -Dtask=spec:jruby'
# - PHASE='-Prake -Dtask=spec:jrubyc'
# - PHASE='-Prake -Dtask=spec:profiler'

matrix:
include:
# these profile do no need to run for all JDKs
- env: PHASE='-Pdist'
jdk: oraclejdk8
- env: PHASE='-Pjruby-jars'
jdk: openjdk7
- env: PHASE='-Pmain'
jdk: oraclejdk8
- env: PHASE='-Pcomplete'
jdk: oraclejdk8
- env: PHASE='-Posgi'
jdk: openjdk7
- env: PHASE='-Pj2ee'
jdk: oraclejdk7
# These next two started crashing on JDK7 in March 2015, possibly due to JVM issues on Travis's Docker-based env
- env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
jdk: oraclejdk8
- env: PHASE='-Pmain,test -Dinvoker.test=extended'
jdk: oraclejdk8
- env: PHASE='-Pjruby_complete_jar_extended -Dinvoker.skip=true'
jdk: oraclejdk8
- env: COMMAND=test/check_versions.sh
jdk: oraclejdk8
# JRuby+Truffle needs Java 8
- env: JT='test fast'
jdk: oraclejdk8
# - env: PHASE='-Pdist'
# jdk: oraclejdk8
# - env: PHASE='-Pjruby-jars'
# jdk: openjdk7
# - env: PHASE='-Pmain'
# jdk: oraclejdk8
# - env: PHASE='-Pcomplete'
# jdk: oraclejdk8
# - env: PHASE='-Posgi'
# jdk: openjdk7
# - env: PHASE='-Pj2ee'
# jdk: oraclejdk7
# # These next two started crashing on JDK7 in March 2015, possibly due to JVM issues on Travis's Docker-based env
# - env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
# jdk: oraclejdk8
# - env: PHASE='-Pmain,test -Dinvoker.test=extended'
# jdk: oraclejdk8
# - env: PHASE='-Pjruby_complete_jar_extended -Dinvoker.skip=true'
# jdk: oraclejdk8
# - env: COMMAND=test/check_versions.sh
# jdk: oraclejdk8
# # JRuby+Truffle needs Java 8
# - env: JT='test fast'
# jdk: oraclejdk8
allow_failures:
- env: PHASE='-Pj2ee'
jdk: oraclejdk7
1 change: 1 addition & 0 deletions test/mri/excludes/TestFileUtils.rb
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
exclude :test_chown_R_force, "hangs on Travis"
exclude :test_chown_R_verbose, "hangs on Travis"