From: Raphaël Pinson <raphael.pinson@camptocamp.com>
Date: Thu, 18 Dec 2014 08:41:36 +0000 (+0100)
Subject: Use Travis container infrastructure
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=12df5ad2ab46f424d490b5f8a405e9ab73d545ba;p=puppet-dhcp.git

Use Travis container infrastructure
---

diff --git a/.travis.yml b/.travis.yml
index 0e37fa9..033f974 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 ---
 language: ruby
+sudo: false
+cache: bundler
 bundler_args: --without system_tests
 script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec fakeroot rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"]
 matrix:
diff --git a/Gemfile b/Gemfile
index f9c2b63..b83f8b6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ group :development, :unit_tests do
   gem 'rake',                    :require => false
   gem 'rspec-puppet',            :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git'
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint',             :require => false
+  gem 'puppet-lint', '< 1.1.0',  :require => false
   gem 'simplecov',               :require => false
   gem 'rspec-puppet-facts',      :require => false
   gem 'json',                    :require => false