Skip to content

Commit

Permalink
Merge pull request redhat-openstack#295 from cmurphy/master
Browse files Browse the repository at this point in the history
Synchronize .travis.yml
  • Loading branch information
hunner committed Jun 30, 2014
2 parents 924d6b8 + 4f8f708 commit a4b3084
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .sync.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
.travis.yml:
unmanaged: true
script: "\"bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--color --format documentation'\""
Rakefile:
unmanaged: true
Gemfile:
Expand Down
26 changes: 8 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,16 @@
language: ruby
bundler_args: --without development
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--color --format documentation'"
rvm:
- 1.8.7
- 1.9.3
- 2.0.0
- ruby-head
env:
- PUPPET_GEM_VERSION=">= 3.0.0"
matrix:
fast_finish: true
allow_failures:
- rvm: 2.0.0
- rvm: ruby-head
include:
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7"
- 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="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0"
notifications:
email: false
webhooks:
urls:
- https://puppet-dev-community.herokuapp.com/event/travis-ci/
on_success: always
on_failure: always
on_start: yes

0 comments on commit a4b3084

Please sign in to comment.