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

Commits on Aug 17, 2016

  1. Revert "[Truffle] Update Truffle."

    This reverts commit 1d27741.
    chrisseaton committed Aug 17, 2016
    Copy the full SHA
    854e48e View commit details
  2. Copy the full SHA
    4050e76 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 ci.hocon
  2. +1 −1 truffle/pom.rb
  3. +1 −1 truffle/pom.xml
2 changes: 1 addition & 1 deletion ci.hocon
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ common-setup: [
[mx, sclone, --kind, git, "https://github.com/jruby/jruby-build-pack.git", jruby-build-pack],
[cp, bin/jruby.bash, bin/jruby],
[chmod, +x, bin/jruby],
${jt} [build]
${jt} [build, --offline]
]

common: {
2 changes: 1 addition & 1 deletion truffle/pom.rb
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@

properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
'truffle.version' => '5d94012d5a6a7a87405f737898e2a2f8db7cd907-SNAPSHOT',
'truffle.version' => '0.16',
'jruby.basedir' => '${basedir}/..',
'maven.test.skip' => 'true' )

2 changes: 1 addition & 1 deletion truffle/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.basedir>${basedir}/..</jruby.basedir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<truffle.version>5d94012d5a6a7a87405f737898e2a2f8db7cd907-SNAPSHOT</truffle.version>
<truffle.version>0.16</truffle.version>
</properties>
<dependencies>
<dependency>