language: ruby
+ bundler_args: --without development
+ script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
rvm:
- 1.8.7
- before_script:
- after_script:
- script: "rake spec"
- branches:
- only:
- - master
+ - 1.9.3
+ - ruby-head
env:
++<<<<<<< HEAD
+ - PUPPET_VERSION=3.0.1
+ - PUPPET_VERSION=2.7.13
+ - PUPPET_VERSION=2.7.6
+ - PUPPET_VERSION=2.6.9
++=======
+ - PUPPET_GEM_VERSION="~> 2.6.0"
+ - PUPPET_GEM_VERSION="~> 2.7.0"
+ - PUPPET_GEM_VERSION="~> 3.0.0"
+ - PUPPET_GEM_VERSION="~> 3.1.0"
+ - PUPPET_GEM_VERSION="~> 3.2.0"
+ matrix:
+ exclude:
+ - rvm: ruby-head
+ env: PUPPET_GEM_VERSION="~> 3.0.0"
+ - rvm: ruby-head
+ env: PUPPET_GEM_VERSION="~> 3.1.0"
+ - rvm: 1.9.3
+ env: PUPPET_GEM_VERSION="~> 2.7.0"
+ - rvm: ruby-head
+ env: PUPPET_GEM_VERSION="~> 2.7.0"
+ - rvm: 1.9.3
+ env: PUPPET_GEM_VERSION="~> 2.6.0"
+ - rvm: ruby-head
+ env: PUPPET_GEM_VERSION="~> 2.6.0"
++>>>>>>> 18ee4cc6c9eb8d16becfec68254d8955eb10c7d5
notifications:
email: false
- gemfile: .gemfile
project_page 'https://github.com/puppetlabs/puppetlabs-apt'
## Add dependencies, if any:
++<<<<<<< HEAD
+dependency 'puppetlabs/stdlib', '>= 3.0.1'
++=======
+ #dependency 'puppetlabs/stdlib', '2.x'
+ # The dependency should be written as above but librarian-puppet
+ # does not support the expression as the PMT does.
+ dependency 'puppetlabs/stdlib', '>= 2.2.1'
++>>>>>>> 18ee4cc6c9eb8d16becfec68254d8955eb10c7d5