aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xiaofeng@google.com>2016-10-16 13:28:18 -0700
committerGitHub <noreply@github.com>2016-10-16 13:28:18 -0700
commit008b5a228b37c054f46ba478ccafa5e855cb16db (patch)
treed2c3ec967623e48e0aa1b88f89338c2968ea3976
parent993d60403015392b5897c1ed36f8feafc51f8186 (diff)
parent9ec7a47ee85813a852e0063d15f54f3f89fe9114 (diff)
downloadprotobuf-008b5a228b37c054f46ba478ccafa5e855cb16db.tar.gz
protobuf-008b5a228b37c054f46ba478ccafa5e855cb16db.tar.bz2
protobuf-008b5a228b37c054f46ba478ccafa5e855cb16db.zip
Merge pull request #2254 from JasonLunn/patch-1
Use git clean before installing via bundler
-rwxr-xr-xruby/travis-test.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/ruby/travis-test.sh b/ruby/travis-test.sh
index d3022657..930165e6 100755
--- a/ruby/travis-test.sh
+++ b/ruby/travis-test.sh
@@ -10,12 +10,14 @@ test_version() {
bash --login -c \
"rvm install $version && rvm use $version && rvm get head && \
which ruby && \
+ git clean -f && \
gem install bundler && bundle && \
rake test"
else
bash --login -c \
"rvm install $version && rvm use $version && \
which ruby && \
+ git clean -f && \
gem install bundler && bundle && \
rake test &&
cd ../conformance && make test_ruby"