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

Commits on Aug 31, 2016

  1. Copy the full SHA
    bf665f1 View commit details
  2. Merge pull request #4121 from lxp/update-ruby-argon2-rev

    [Truffle] Update ruby-argon2 revision in CExt tests
    chrisseaton authored Aug 31, 2016
    Copy the full SHA
    a61ab19 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 tool/jt.rb
2 changes: 1 addition & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -868,7 +868,7 @@ def test_cexts(*args)
['oily_png', ['chunky_png-1.3.6', 'oily_png-1.2.0'], ['oily_png']],
['psd_native', ['chunky_png-1.3.6', 'oily_png-1.2.0', 'bindata-2.3.1', 'hashie-3.4.4', 'psd-enginedata-1.1.1', 'psd-2.1.2', 'psd_native-1.1.3'], ['oily_png', 'psd_native']],
['nokogiri', [], ['nokogiri']],
['ruby-argon2', [], [], "#{ENV['GEM_HOME']}/bundler/gems/ruby-argon2-5a527075e88b"]
['ruby-argon2', [], [], "#{ENV['GEM_HOME']}/bundler/gems/ruby-argon2-bd3fb1e056cf"]
].each do |gem_name, dependencies, libs, gem_root|
next if gem_name == 'nokogiri' # nokogiri totally excluded
next if gem_name == 'nokogiri' && no_libxml