diff options
| author | Adrien Thebo <git@somethingsinistral.net> | 2013-02-25 14:00:20 -0800 |
|---|---|---|
| committer | Adrien Thebo <git@somethingsinistral.net> | 2013-04-08 10:04:35 -0700 |
| commit | 6647d1c69d1feb20d0d51a9cbd8734259bac4ef3 (patch) | |
| tree | dde7c30f17fa9935f74179d3d0b41cd560ab4555 /.gitignore | |
| parent | 755d3d2de505d098faa323fa751497d7f4a3dad1 (diff) | |
(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
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -2,3 +2,6 @@ pkg/ .DS_Store metadata.json coverage/ +Gemfile.lock +.bundle/ +vendor/bundle/ |