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

Commits on Oct 21, 2016

  1. Copy the full SHA
    a10a78d View commit details
  2. Copy the full SHA
    0f833b4 View commit details
  3. Copy the full SHA
    e7ee5f9 View commit details
  4. Copy the full SHA
    83182b8 View commit details
Showing with 28 additions and 1 deletion.
  1. +10 −1 ci.hocon
  2. +11 −0 mx.jruby/mx_jruby.py
  3. +7 −0 mx.jruby/suite.py
11 changes: 10 additions & 1 deletion ci.hocon
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ common: {
[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],
[mx, build]
[mx, build, --force-javac]
]

timelimit: "01:00:00"
@@ -355,6 +355,13 @@ test-cexts: ${sulong} ${gem-test-pack} {
]
}

deployBinaries: {
run: [
[mx, deploy-binary-if-truffle-head, jruby-binary-snapshots]
]
timelimit: "30:00"
}

builds: [
{name: ruby-test-fast} ${common} ${gate-caps} {run: [${jt} [test, fast]]},
{name: ruby-test-tck} ${common} ${gate-caps} {run: [[mx, rubytck]]},
@@ -443,4 +450,6 @@ builds: [
{name: ruby-benchmarks-server-graal-enterprise-no-om} ${common} ${graal-enterprise-no-om} ${daily-bench-caps} ${jruby-truffle} ${server-benchmarks},
{name: ruby-benchmarks-server-graal-vm-snapshot} ${common} ${graal-vm-snapshot} ${bench-caps} ${jruby-truffle} ${server-benchmarks}
{name: ruby-benchmarks-server-graal-vm-release} ${common} ${graal-vm-release} ${bench-caps} ${jruby-truffle} ${server-benchmarks}

{name: ruby-deploy-binaries} ${common} ${gate-caps} ${deployBinaries}
]
11 changes: 11 additions & 0 deletions mx.jruby/mx_jruby.py
Original file line number Diff line number Diff line change
@@ -31,6 +31,16 @@
'RUBY-TEST'
]

def deploy_binary_if_truffle_head(args):
"""If the active branch is 'truffle-head', deploy binaries for the primary suite to remote maven repository."""
primary_branch = 'truffle-head'
active_branch = mx.VC.get_vc(_suite.dir).active_branch(_suite.dir)
if active_branch == primary_branch:
return mx.command_function('deploy-binary')(args)
else:
mx.log('The active branch is "%s". Binaries are deployed only if the active branch is "%s".' % (active_branch, primary_branch))
return 0

def unittest_use_distribution_jars(config):
"""use the distribution jars instead of the class files"""
vmArgs, mainClass, mainClassArgs = config
@@ -263,6 +273,7 @@ def ruby_tck(args):
mx.update_commands(_suite, {
'ruby' : [ruby_command, '[ruby args|@VM options]'],
'rubytck': [ruby_tck, ''],
'deploy-binary-if-truffle-head': [deploy_binary_if_truffle_head, ''],
})

# Utilities
7 changes: 7 additions & 0 deletions mx.jruby/suite.py
Original file line number Diff line number Diff line change
@@ -70,6 +70,13 @@ def mavenLib(mavenDep, sha1, sourceSha1, license):
},
},

"repositories" : {
"jruby-binary-snapshots" : {
"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots",
"licenses" : ["EPL"]
},
},

"libraries": {

# ------------- Libraries -------------