From 0c9e14eefff9afb157c06020c4c4dc368d4acded Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Tue, 21 Oct 2014 14:06:13 -0500 Subject: [PATCH 1/6] Update cibuild --- script/cibuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index 52984df6..d38b0c51 100755 --- a/script/cibuild +++ b/script/cibuild @@ -1,7 +1,10 @@ #!/bin/sh if [ -d /usr/share/rbenv/shims ]; then export PATH=/usr/share/rbenv/shims:$PATH - export RBENV_VERSION="2.1.2p95-github" + export RBENV_VERSION=2.1.2-github + export RUBY_VERSION=2.1.2-github fi +echo "Using $(rbenv version)" + bundle exec rake From c105208481fad44264b4002bf210a9ec19f81ec4 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Tue, 21 Oct 2014 14:06:43 -0500 Subject: [PATCH 2/6] Update cibuild --- script/cibuild | 1 + 1 file changed, 1 insertion(+) diff --git a/script/cibuild b/script/cibuild index d38b0c51..be6fefae 100755 --- a/script/cibuild +++ b/script/cibuild @@ -7,4 +7,5 @@ fi echo "Using $(rbenv version)" +bundle install bundle exec rake From 3ba090de7ed8b3009c765e207d0f15ceb0d786ac Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Tue, 21 Oct 2014 16:07:49 -0500 Subject: [PATCH 3/6] Update cibuild --- script/cibuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/script/cibuild b/script/cibuild index be6fefae..d2e50b13 100755 --- a/script/cibuild +++ b/script/cibuild @@ -5,7 +5,10 @@ if [ -d /usr/share/rbenv/shims ]; then export RUBY_VERSION=2.1.2-github fi -echo "Using $(rbenv version)" +set -x +git log -n 1 HEAD | cat +ruby -v +bundle -v +set +x -bundle install bundle exec rake From a9b9e6216b5ac1f489b2cc7e1fa5896d0fcc34a7 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Tue, 21 Oct 2014 16:10:05 -0500 Subject: [PATCH 4/6] Update cibuild --- script/cibuild | 1 + 1 file changed, 1 insertion(+) diff --git a/script/cibuild b/script/cibuild index d2e50b13..c48b946e 100755 --- a/script/cibuild +++ b/script/cibuild @@ -11,4 +11,5 @@ ruby -v bundle -v set +x +bundle install bundle exec rake From d831205f6a2bbb3a98cd7afc5762cef8a19453d9 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Tue, 21 Oct 2014 16:41:55 -0500 Subject: [PATCH 5/6] Update cibuild --- script/cibuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index c48b946e..d472f56e 100755 --- a/script/cibuild +++ b/script/cibuild @@ -11,5 +11,7 @@ ruby -v bundle -v set +x -bundle install +mkdir -p ./vendor/gems + +bundle install --local --path ./vendor/gems bundle exec rake From 6d073029632511f85554334ffb7da2a67150f51a Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Tue, 21 Oct 2014 16:49:13 -0500 Subject: [PATCH 6/6] Update cibuild --- script/cibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index d472f56e..c929d533 100755 --- a/script/cibuild +++ b/script/cibuild @@ -13,5 +13,5 @@ set +x mkdir -p ./vendor/gems -bundle install --local --path ./vendor/gems +bundle install --full-index --local --path ./vendor/gems bundle exec rake