From 6647d1c69d1feb20d0d51a9cbd8734259bac4ef3 Mon Sep 17 00:00:00 2001 From: Adrien Thebo Date: Mon, 25 Feb 2013 14:00:20 -0800 Subject: (maint) Backport Gemfile and .travis.yml to 2.x This is a partial backport and update of 03c5c4a434c2290c021034dbfed82cb0f97e0e87 to add travis-ci support and a Gemfile to 2.x. Right now we're not testing 2.x in travis-ci and we're experiencing spec failures because we have to install rspec-puppet from git. The best resolution for this is to consistently use a Gemfile for running tests. This commit also rewrites the .travis.yml for 2.x to only test 2.x versions against ruby 1.8.7 and Puppet < 3.0 Conflicts: .travis.yml --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 481fc81..416889c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ pkg/ .DS_Store metadata.json coverage/ +Gemfile.lock +.bundle/ +vendor/bundle/ -- cgit v1.2.3