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

Commits on Jun 6, 2016

  1. Copy the full SHA
    a8f3f5c View commit details
  2. Copy the full SHA
    baffcbe View commit details
  3. Copy the full SHA
    9d7ce86 View commit details
Showing with 17 additions and 8 deletions.
  1. +17 −8 ci.hocon
25 changes: 17 additions & 8 deletions ci.hocon
Original file line number Diff line number Diff line change
@@ -97,16 +97,25 @@ gate-caps: {
}

bench-caps: {
capabilities: [x52, linux, amd64, bench]
capabilities: [x52, linux, amd64, bench, post-merge]
}

daily-bench-caps: {
capabilities: [x52, linux, amd64, daily]
}

post-process-and-upload-results: [
[tool/truffle/post-process-results-json.rb, bench-results.json, bench-results-processed.json],
[cat, bench-results-processed.json],
[bench-uploader.py, bench-results-processed.json]
]

metrics: {
run: [
[mx, benchmark, allocation],
[tool/truffle/post-process-results-json.rb, bench-results.json, bench-results-processed.json],
[cat, bench-results-processed.json],
[bench-uploader.py, bench-results-processed.json]
]
[mx, benchmark, allocation]
] ${post-process-and-upload-results} [
[mx, benchmark, minheap]
] ${post-process-and-upload-results}
}

builds: [
@@ -123,7 +132,7 @@ builds: [
{name: ruby-test-compiler-graal-core} ${common} ${graal-core} ${gate-caps} {run: [${jt} [test, compiler]]},
{name: ruby-test-compiler-graalvm} ${common} ${graalvm} ${gate-caps} {run: [${jt} [test, compiler]]},

{name: ruby-test-metrics-noindy} ${common} ${no-graal} ${bench-caps} ${jruby-noindy} ${metrics},
{name: ruby-test-metrics-indy} ${common} ${no-graal} ${bench-caps} ${jruby-indy} ${metrics},
{name: ruby-test-metrics-noindy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-noindy} ${metrics},
{name: ruby-test-metrics-indy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-indy} ${metrics},
{name: ruby-test-metrics-truffle} ${common} ${no-graal} ${bench-caps} ${jruby-truffle} ${metrics}
]