diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2013-02-25 14:11:07 -0800 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2013-02-25 14:11:07 -0800 |
| commit | 4fdefd07617a23797ada6aa0eb1a5dadd5b9bd43 (patch) | |
| tree | b7c7efda1bd54d5a27fb6633332a44934183d074 | |
| parent | d2e0c53243060a158e2fde18d8b05718397e0ded (diff) | |
| parent | 03c5c4a434c2290c021034dbfed82cb0f97e0e87 (diff) | |
| download | puppet-stdlib-4fdefd07617a23797ada6aa0eb1a5dadd5b9bd43.tar.gz puppet-stdlib-4fdefd07617a23797ada6aa0eb1a5dadd5b9bd43.tar.bz2 | |
Merge branch 'maint/3.x/ruby_two_travis' into 3.x
* maint/3.x/ruby_two_travis:
(maint) Add Ruby 2.0.0 to Travis build matrix
| -rw-r--r-- | .gemfile | 5 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | .travis.yml | 25 | ||||
| -rw-r--r-- | Gemfile | 8 |
4 files changed, 29 insertions, 12 deletions
diff --git a/.gemfile b/.gemfile deleted file mode 100644 index 9aad840..0000000 --- a/.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source :rubygems - -puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7'] -gem 'puppet', puppetversion -gem 'puppetlabs_spec_helper', '>= 0.1.0' @@ -2,3 +2,6 @@ pkg/ .DS_Store metadata.json coverage/ +Gemfile.lock +.bundle/ +vendor/bundle/ diff --git a/.travis.yml b/.travis.yml index 0ec5a08..7e40b3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,27 @@ language: ruby +bundler_args: --without development +script: "bundle exec rake spec SPEC_OPTS='--color --format documentation'" rvm: - 1.8.7 -before_script: -after_script: -script: "rake spec_full" -branches: - only: - - master env: + - PUPPET_VERSION=">= 3.0.0" + - PUPPET_VERSION="~> 2.7.0" - PUPPET_VERSION=2.7.13 - PUPPET_VERSION=2.7.6 - PUPPET_VERSION=2.6.9 +matrix: + allow_failures: + - rvm: 2.0.0 + include: + - rvm: 2.0.0 + env: PUPPET_VERSION=">= 3.0.0" + - rvm: 1.9.3 + env: PUPPET_VERSION=">= 3.0.0" notifications: email: false -gemfile: .gemfile + webhooks: + urls: + - https://puppet-dev-community.herokuapp.com/event/travis-ci/ + on_success: always + on_failure: always + on_start: yes @@ -0,0 +1,8 @@ +source "https://rubygems.org" + +if puppetversion = ENV['PUPPET_VERSION'] + gem 'puppet', puppetversion +else + gem 'puppet' +end +gem 'puppetlabs_spec_helper', '>= 0.1.0' |