summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@opscode.com>2014-01-02 12:23:40 -0800
committerdanielsdeleo <dan@opscode.com>2014-01-02 12:23:40 -0800
commit9203d686473ade1ff3b6f2909f04b532c856cc03 (patch)
tree575d39784c0d71748faf2842719d539b4e436f18
parent217ecc61a9047a7b9e0a4eba3b5a7364b2fac95f (diff)
parentcf57ac7d20df3dee300e33d60dda751c32e59572 (diff)
downloadohai-9203d686473ade1ff3b6f2909f04b532c856cc03.tar.gz
Merge branch 'ruby18-travis-workaround'
See OHAI-545
-rw-r--r--.travis.yml15
1 files changed, 14 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index bd27acbb..bf2a4b83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,19 @@
+# Temporary workaround for issue with rubygems 2.2.0 with bundler 1.5 on ruby
+# 1.8.7.
+#
+# A fix has been merged to rubygems but not yet released. See:
+# https://github.com/rubygems/rubygems/commit/f8e0f1d5f67cfc4e1966cc1e2db367aebf8a09e4
+#
+# See also CHEF-4916
+#
+# This workaround should be removed when that fix is released.
+before_install:
+ - gem update --system 2.1.11
+ - gem --version
+
rvm:
- 1.8.7
- 1.9.2
- 1.9.3
-script: bundle exec rake spec \ No newline at end of file
+script: bundle exec rake spec