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: 29bb86423ebc
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3a6b82823027
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 28, 2016

  1. Copy the full SHA
    6ea0d6c View commit details
  2. Copy the full SHA
    3a6b828 View commit details
Showing with 7 additions and 2 deletions.
  1. +1 −0 .travis.yml
  2. +6 −2 tool/jt.rb
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -99,6 +99,7 @@ matrix:
- env:
- JT=check_ambiguous_arguments
- SKIP_BUILD=true
- V=1
jdk: oraclejdk8
- env:
- USE_BUILD_PACK=yes
8 changes: 6 additions & 2 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -31,6 +31,8 @@
JEXCEPTION = "-Xtruffle.exceptions.print_java=true"
METRICS_REPS = 10

VERBOSE = ENV.include? 'V'

MAC = `uname -a`.include?('Darwin')

if MAC
@@ -331,7 +333,9 @@ def mvn(*args)
options = []
end

sh *options, './mvnw', *(['-q'] + args)
args = ['-q', *args] unless VERBOSE

sh *options, './mvnw', *args
end

def maven_options(*options)
@@ -495,7 +499,7 @@ def bootstrap(*options)
def build(*options)
maven_options, other_options = maven_options(*options)
project = other_options.first
env = {'JRUBY_BUILD_MORE_QUIET' => 'true'}
env = VERBOSE ? {} : {'JRUBY_BUILD_MORE_QUIET' => 'true'}
case project
when 'truffle'
mvn env, *maven_options, '-pl', 'truffle', 'package'