diff options
-rw-r--r-- | .sync.yml | 17 | ||||
-rw-r--r-- | .travis.yml | 30 | ||||
-rw-r--r-- | Gemfile | 6 |
3 files changed, 14 insertions, 39 deletions
@@ -1,21 +1,6 @@ --- .travis.yml: - env_matrix: - - PUPPET_GEM_VERSION="~> 2.7.0" - - PUPPET_GEM_VERSION="~> 3.3.0" - additional: - - - configs: - after_success: - - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release - - .forge-release/publish - - - configs: - before_install: - - gem update --system 2.1.11 - - gem --version - comments: - - Temporary workaround for broken Rubygems on Travis + script: "\"bundle exec rake spec SPEC_OPTS='--format documentation'\"" Rakefile: unmanaged: true spec/spec_helper.rb: diff --git a/.travis.yml b/.travis.yml index ef2a36e..c72d5e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,33 +1,17 @@ --- -branches: - only: - - master language: ruby bundler_args: --without development script: "bundle exec rake spec SPEC_OPTS='--format documentation'" -rvm: - - 1.8.7 - - 1.9.3 - - 2.0.0 -env: - matrix: - - PUPPET_GEM_VERSION="~> 2.7.0" - - PUPPET_GEM_VERSION="~> 3.3.0" matrix: fast_finish: true - exclude: + include: + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" - rvm: 1.9.3 - env: PUPPET_GEM_VERSION="~> 2.7.0" + env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 2.7.0" + env: PUPPET_GEM_VERSION="~> 3.0" notifications: email: false -after_success: -- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release -- .forge-release/publish -before_install: -- gem update --system 2.1.11 -- gem --version -comments: -- Temporary workaround for broken Rubygems on Travis - @@ -12,6 +12,12 @@ group :development, :test do gem 'simplecov', :require => false end +if facterversion = ENV['FACTER_GEM_VERSION'] + gem 'facter', facterversion, :require => false +else + gem 'facter', :require => false +end + if puppetversion = ENV['PUPPET_GEM_VERSION'] gem 'puppet', puppetversion, :require => false else |