Skip to content

Commit 9c97ab8

Browse files
author
Jeff McCune
committed
Merge branch 'feature/master/travis_ci'
* feature/master/travis_ci: (maint) Add Travis CI Support
2 parents 388cfa5 + d082046 commit 9c97ab8

File tree

4 files changed

+34
-17
lines changed

4 files changed

+34
-17
lines changed

.gemfile

-5
This file was deleted.

.travis.yml

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
language: ruby
2+
bundler_args: --without development
3+
script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
4+
notifications:
5+
email: false
26
rvm:
7+
- 1.9.3
38
- 1.8.7
4-
before_script:
5-
after_script:
6-
script: "rake spec_full"
7-
branches:
8-
only:
9-
- master
109
env:
11-
- PUPPET_VERSION=2.7.13
12-
- PUPPET_VERSION=2.7.6
13-
- PUPPET_VERSION=2.6.9
14-
notifications:
15-
email: false
16-
gemfile: .gemfile
10+
- PUPPET_GEM_VERSION="~> 2.7.0"
11+
- PUPPET_GEM_VERSION=">= 3.0.0"
12+
matrix:
13+
exclude:
14+
- rvm: 1.9.3
15+
env: PUPPET_GEM_VERSION="~> 2.7.0"

Gemfile

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
source :rubygems
2+
3+
group :development do
4+
gem 'watchr'
5+
end
6+
7+
group :development, :test do
8+
gem 'rake'
9+
gem 'rspec', "~> 2.11.0", :require => false
10+
gem 'mocha', "~> 0.10.5", :require => false
11+
gem 'puppetlabs_spec_helper', :require => false
12+
gem 'rspec-puppet', :require => false
13+
end
14+
15+
if puppetversion = ENV['PUPPET_GEM_VERSION']
16+
gem 'puppet', puppetversion, :require => false
17+
else
18+
gem 'puppet', :require => false
19+
end
20+
21+
# vim:ft=ruby

README.markdown

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Puppet Labs Standard Library #
22

3+
[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-stdlib.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-stdlib)
4+
35
This module provides a "standard library" of resources for developing Puppet
46
Modules. This modules will include the following additions to Puppet
57

0 commit comments

Comments
 (0)