summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshley Penney <ashley.penney@puppetlabs.com>2013-07-09 16:27:59 -0400
committerAshley Penney <ashley.penney@puppetlabs.com>2013-07-09 16:27:59 -0400
commit85f0869767311900b136b7eeeccaa00ca5b7ed9c (patch)
tree0e9a905f9914b3b8d1e8ddc142ee98f4888265fa
parentf6d637e2394e8ad36a8f67aefaa4e050d2a163b4 (diff)
Fix up travis for more testing.
-rw-r--r--.travis.yml41
1 files changed, 28 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index c8d205f..6cf27e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,24 +2,39 @@
branches:
only:
- master
-notifications:
- email: false
language: ruby
-script: 'rake spec'
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
after_success:
-- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
-- .forge-releng/publish
+ - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
+ - .forge-releng/publish
rvm:
- 1.8.7
- 1.9.3
+- 2.0.0
env:
matrix:
- - PUPPET_VERSION=2.6.18
- - PUPPET_VERSION=2.7.21
- - PUPPET_VERSION=3.1.1
+ - PUPPET_GEM_VERSION="~> 2.7.0"
+ - PUPPET_GEM_VERSION="~> 3.0.0"
+ - PUPPET_GEM_VERSION="~> 3.1.0"
+ - PUPPET_GEM_VERSION="~> 3.2.0"
global:
- - PUBLISHER_LOGIN=puppetlabs
- - secure: |-
- ZiIkYd9+CdPzpwSjFPnVkCx1FIlipxpbdyD33q94h2Tj5zXjNb1GXizVy0NR
- kVxGhU5Ld8y9z8DTqKRgCI1Yymg3H//OU++PKLOQj/X5juWVR4URBNPeBOzu
- IJBDl1MADKA4i1+jAZPpz4mTvTtKS4pWKErgCSmhSfsY1hs7n6c=
+ - PUBLISHER_LOGIN=puppetlabs
+ - secure: |-
+ MO4pB4bqBQJjm2yFHf3Mgho+y0Qv4GmMxTMhzI02tGy1V0HMtruZbR7EBN0i
+ n2CiR7V9V0mNR7/ymzDMF9yVBcgqyXMsp/C6u992Dd0U63ZwFpbRWkxuAeEY
+ ioupWBkiczjVEo+sxn+gVOnx28pcH/X8kDWbr6wFOMIjO03K66Y=
+matrix:
+ exclude:
+ - rvm: 1.9.3
+ env: PUPPET_GEM_VERSION="~> 2.7.0"
+ - rvm: 2.0.0
+ env: PUPPET_GEM_VERSION="~> 2.7.0"
+ - rvm: 2.0.0
+ env: PUPPET_GEM_VERSION="~> 3.0.0"
+ - rvm: 2.0.0
+ env: PUPPET_GEM_VERSION="~> 3.1.0"
+ - rvm: 1.8.7
+ env: PUPPET_GEM_VERSION="~> 3.2.0"
+notifications:
+ email: false