Browse files

Merge pull request #148 from blkperl/update_travis

Update travis config file
  • Loading branch information...
2 parents c8f9880 + a3868bc commit ec804ef7150417c86b67bcb53c557f09547cb188 @kbarber kbarber committed Feb 3, 2013
Showing with 36 additions and 16 deletions.
  1. +0 −5 .gemfile
  2. +21 −11 .travis.yml
  3. +13 −0 Gemfile
  4. +2 −0 README.md
View
5 .gemfile
@@ -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'
View
32 .travis.yml
@@ -1,17 +1,27 @@
language: ruby
+bundler_args: --without development
+before_script:
+ - "[ $PUPPET_GEM_VERSION ~> 2.6 ] && git clone git://github.com/puppetlabs/puppetlabs-create_resources.git spec/fixtures/modules/create_resources || true"
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
rvm:
- 1.8.7
-before_script:
- - "[ '2.6.9' = $PUPPET_VERSION ] && git clone git://github.com/puppetlabs/puppetlabs-create_resources.git spec/fixtures/modules/create_resources || true"
-after_script:
-script: "rake spec"
-branches:
- only:
- - master
+ - 1.9.3
+ - ruby-head
env:
- - PUPPET_VERSION=2.7.13
- - PUPPET_VERSION=2.7.6
- - PUPPET_VERSION=2.6.9
+ - PUPPET_GEM_VERSION="~> 2.6"
+ - PUPPET_GEM_VERSION="~> 2.7"
+ - PUPPET_GEM_VERSION="~> 3.0"
+matrix:
+ allow_failures:
+ - rvm: ruby-head
+ exclude:
+ - rvm: 1.9.3
+ env: PUPPET_GEM_VERSION="~> 2.7"
+ - rvm: ruby-head
+ env: PUPPET_GEM_VERSION="~> 2.7"
+ - rvm: 1.9.3
+ env: PUPPET_GEM_VERSION="~> 2.6"
+ - rvm: ruby-head
+ env: PUPPET_GEM_VERSION="~> 2.6"
notifications:
email: false
-gemfile: .gemfile
View
13 Gemfile
@@ -0,0 +1,13 @@
+source :rubygems
+
+group :development, :test do
+ gem 'puppetlabs_spec_helper', :require => false
+end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+ gem 'puppet', puppetversion, :require => false
+else
+ gem 'puppet', :require => false
+end
+
+# vim:ft=ruby
View
2 README.md
@@ -1,5 +1,7 @@
# Mysql module for Puppet
+[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-mysql.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-mysql)
+
This module manages mysql on Linux (RedHat/Debian) distros. A native mysql provider implements database resource type to handle database, database user, and database permission.
Pluginsync needs to be enabled for this module to function properly.

0 comments on commit ec804ef

Please sign in to comment.