Skip to content

Commit c2b4a3d

Browse files
authored
Merge pull request #144 from Phil-Friderici/puppet6
Support Puppet 5 & 6
2 parents 466c217 + f1214fb commit c2b4a3d

File tree

4 files changed

+24
-18
lines changed

4 files changed

+24
-18
lines changed

.fixtures.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
fixtures:
22
repositories:
3+
cron:
4+
repo: 'git://github.com/puppetlabs/puppetlabs-cron_core.git'
5+
ref: '1.0.0'
36
inifile:
47
repo: 'https://github.com/puppetlabs/puppetlabs-inifile.git'
58
ref: '1.6.0'

.travis.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
---
22
language: ruby
33

4-
rvm:
5-
- 2.1.9
6-
7-
env:
8-
matrix:
9-
- RUBYGEMS_VERSION=2.0.17 BUNDLER_VERSION=1.17.3 PUPPET_GEM_VERSION="~> 4.7.0"
10-
- RUBYGEMS_VERSION=2.0.17 BUNDLER_VERSION=1.17.3 PUPPET_GEM_VERSION="~> 4.8.0"
11-
- RUBYGEMS_VERSION=2.0.17 BUNDLER_VERSION=1.17.3 PUPPET_GEM_VERSION="~> 4.9.0"
12-
- RUBYGEMS_VERSION=2.0.17 BUNDLER_VERSION=1.17.3 PUPPET_GEM_VERSION="~> 4.10.0"
13-
- RUBYGEMS_VERSION=2.0.17 BUNDLER_VERSION=1.17.3 PUPPET_GEM_VERSION="~> 4"
14-
154
sudo: false
165

176
before_install:
@@ -28,6 +17,21 @@ script: 'SPEC_OPTS="--format documentation" bundle exec rake test'
2817

2918
matrix:
3019
fast_finish: true
20+
include:
21+
- rvm: 2.1.9
22+
env: RUBYGEMS_VERSION=2.0.17 BUNDLER_VERSION=1.17.3 PUPPET_GEM_VERSION="~> 4.7.0"
23+
- rvm: 2.1.9
24+
env: RUBYGEMS_VERSION=2.0.17 BUNDLER_VERSION=1.17.3 PUPPET_GEM_VERSION="~> 4.8.0"
25+
- rvm: 2.1.9
26+
env: RUBYGEMS_VERSION=2.0.17 BUNDLER_VERSION=1.17.3 PUPPET_GEM_VERSION="~> 4.9.0"
27+
- rvm: 2.1.9
28+
env: RUBYGEMS_VERSION=2.0.17 BUNDLER_VERSION=1.17.3 PUPPET_GEM_VERSION="~> 4.10.0"
29+
- rvm: 2.1.9
30+
env: RUBYGEMS_VERSION=2.0.17 BUNDLER_VERSION=1.17.3 PUPPET_GEM_VERSION="~> 4"
31+
- rvm: 2.4.1
32+
env: PUPPET_GEM_VERSION="~> 5"
33+
- rvm: 2.5.1
34+
env: PUPPET_GEM_VERSION="~> 6"
3135

3236
notifications:
3337
email: false

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,13 @@ For version ranges, please see metadata.json.
5353

5454
# Compatibility
5555

56-
Puppet v4 with Ruby versions 2.1.9 with the following platforms. Please
57-
consult the CI testing matrix in .travis.yml for more info. If you are
58-
looking for Puppet v3, please see the [puppetv3
59-
branch](https://github.com/ghoneycutt/puppet-module-puppet/tree/puppetv3).
56+
Puppet v4 (Ruby 2.1.9), Puppet v5 (Ruby 2.4.1), and Puppet v6 (Ruby 2.5.1)
57+
with the following platforms. Please consult the CI testing matrix in
58+
`.travis.yml` for more info. If you are looking for Puppet v3, please see
59+
the [puppetv3 branch](https://github.com/ghoneycutt/puppet-module-puppet/tree/puppetv3).
6060

6161
* EL 6
6262

63-
===
64-
6563
# Class Descriptions
6664

6765
## Class `puppet`

metadata.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"requirements": [
1212
{
1313
"name": "puppet",
14-
"version_requirement": ">= 4.7.0 < 5.0.0"
14+
"version_requirement": ">= 4.7.0 < 7.0.0"
1515
}
1616
],
1717
"operatingsystem_support": [
@@ -41,6 +41,7 @@
4141
}
4242
],
4343
"dependencies": [
44+
{"name":"puppetlabs/cron_core","version_requirement":">= 1.0.0 <2.0.0"},
4445
{"name":"puppetlabs/inifile","version_requirement":">= 1.6.0 < 2.0.0"},
4546
{"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"}
4647
]

0 commit comments

Comments
 (0)