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: 297c9532fb5f
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 14d1d296bda9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 17, 2015

  1. Revert "Use JDK8 for these three...they are affected by JVM+Travis is… 

    …sues."

This reverts commit 297c953.
    @headius
    headius committed Mar 17, 2015
    Copy the full SHA
    df6bae2 View commit details

  2. Try turning off sudo:false to fix build issues.

    @headius
    headius committed Mar 17, 2015
    Copy the full SHA
    14d1d29 View commit details
Showing with 1 addition and 12 deletions.
  1. +1 −12 .travis.yml
13 changes: 1 addition & 12 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,6 @@ before_script:
- "export PATH=`pwd`/bin:$PATH"
- echo $HOME

sudo: false

cache:
directories:
- $HOME/.m2

jdk: openjdk6

env:
@@ -31,13 +25,8 @@ env:
matrix:
include:
# there is one integration test which uses a external jar for jdk7+
# These started failing on 6 and 7 in March 2015, possibly due to travis+docker+jvm issues
- jdk: oraclejdk8
- jdk: oraclejdk7
env: TARGET='main'
- jdk: oraclejdk8
env: TARGET='test-jruby-jars'
- jdk: oraclejdk8
env: TARGET='jruby-jars-extended'
fast_finish: true

branches: