Skip to content

Commit

Permalink
[Truffle] specify commit of jruby-truffle-gem-test-pack to be used in…
Browse files Browse the repository at this point in the history
… build
  • Loading branch information
pitr-ch committed Oct 7, 2016
1 parent 8ff150d commit a71b014
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
9 changes: 5 additions & 4 deletions ci.hocon
Expand Up @@ -17,7 +17,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],
[chmod, "+x", bin/jruby],
[mx, build]
]

Expand Down Expand Up @@ -317,9 +317,10 @@ gem-test-pack: {
environment: {
GEM_HOME: ../jruby-truffle-gem-test-pack/gems
}

setup: [
[mx, sclone, --kind, git, "https://github.com/jruby/jruby-truffle-gem-test-pack.git", ../jruby-truffle-gem-test-pack]
[mx, sclone, --kind, git, "https://github.com/jruby/jruby-truffle-gem-test-pack.git", ../jruby-truffle-gem-test-pack],
[test/truffle/gem-test-pack-checkout-revision.sh]
]
}

Expand All @@ -333,7 +334,7 @@ test-gems: ${gem-test-pack} {

test-ecosystem: ${gem-test-pack} {
setup: ${common.setup} ${gem-test-pack.setup}

run: [
[bin/jruby, bin/gem, install, "$GEM_HOME/cache/bundler-1.12.5.gem"],
${jt} [test, ecosystem]
Expand Down
3 changes: 3 additions & 0 deletions test/truffle/ecosystem-travis-install.sh
Expand Up @@ -11,3 +11,6 @@ git clone \
--branch master \
https://github.com/jruby/jruby-truffle-gem-test-pack.git \
../jruby-truffle-gem-test-pack

test/truffle/gem-test-pack-checkout-revision.sh

8 changes: 8 additions & 0 deletions test/truffle/gem-test-pack-checkout-revision.sh
@@ -0,0 +1,8 @@
#!/usr/bin/env bash

set -e
set -x

revision=8a041d63982822462681305ff634a40429f7cd58

This comment has been minimized.

Copy link
@pitr-ch

pitr-ch Oct 10, 2016

Author Member

@jruby/truffle update this line if you want to run against newer jruby-truffle-gem-test-pack

This comment has been minimized.

Copy link
@chrisseaton

chrisseaton Oct 10, 2016

Contributor

I was going to say 'do you not just want latest' but I suppose this'll be useful for bisection and things.

This comment has been minimized.

Copy link
@pitr-ch

pitr-ch Oct 10, 2016

Author Member

Yeah, the less varying things in CI the better. I also need it to push jtr > jruby-truffle-tool renaming.


git -C ../jruby-truffle-gem-test-pack checkout ${revision}

0 comments on commit a71b014

Please sign in to comment.