diff options
author | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2014-04-18 13:58:26 +0200 |
---|---|---|
committer | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2014-04-18 14:00:31 +0200 |
commit | a6d8dd515489730863341e6d5610bcbe7d7ce97d (patch) | |
tree | 3baa178163811c175751cbd5cd27921e329fa584 | |
parent | 98edbd47570b16e541d6e65451edb9e3878818a3 (diff) |
Update travis matrix
-rw-r--r-- | .travis.yml | 35 | ||||
-rw-r--r-- | Gemfile | 15 | ||||
-rw-r--r-- | README.markdown | 2 |
3 files changed, 34 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 6d7c0f8..d780a76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,36 @@ language: ruby +bundler_args: --without development +script: + - bundle exec rake spec SPEC_OPTS='--format documentation' + - bundle exec rake lint rvm: - 1.8.7 - 1.9.3 - 2.0.0 - - ruby-head + - 2.1.0 env: - - PUPPET_GEM_VERSION=">= 3.0.0" + - PUPPET_GEM_VERSION="~> 2.7.0" + - PUPPET_GEM_VERSION="~> 3.1.0" + - PUPPET_GEM_VERSION="~> 3.2.0" + - PUPPET_GEM_VERSION="~> 3.3.0" + - PUPPET_GEM_VERSION="~> 3.4.0" + - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes" matrix: - allow_failures: + fast_finish: true + exclude: + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 2.7.0" - rvm: 2.0.0 - - rvm: ruby-head - include: - - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 2.7" + env: PUPPET_GEM_VERSION="~> 2.7.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.1.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 2.7.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 3.1.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 3.2.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 3.3.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 3.4.0" @@ -1,13 +1,6 @@ -source :rubygems +source 'https://rubygems.org' -if ENV.key?('PUPPET_VERSION') - puppetversion = "= #{ENV['PUPPET_VERSION']}" -else - puppetversion = ['>= 2.7'] -end - -gem 'rake' +puppetversion = ENV['PUPPET_GEM_VERSION'] +gem 'puppet', puppetversion, :require => false gem 'puppet-lint' -gem 'rspec-puppet', '>= 0.1.6' -gem 'puppet', puppetversion -gem 'puppetlabs_spec_helper', '>= 0.4.0' +gem 'puppetlabs_spec_helper' diff --git a/README.markdown b/README.markdown index bf25e75..a97d229 100644 --- a/README.markdown +++ b/README.markdown @@ -1,5 +1,7 @@ # Augeas Puppet module +[![Build Status](https://travis-ci.org/camptocamp/puppet-augeas.png?branch=master)](https://travis-ci.org/camptocamp/puppet-augeas) + **Install and configure Augeas.** This module is provided by [Camptocamp](http://www.camptocamp.com/) |