Skip to content

Commit 342d2e8

Browse files
committed
Refactor some travis settings and add clean setup
1 parent 62d04de commit 342d2e8

File tree

5 files changed

+32
-14
lines changed

5 files changed

+32
-14
lines changed

.travis.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1+
---
12
language: ruby
2-
3-
rvm:
4-
- 1.9.3
5-
63
script:
74
- "bundle exec rake lint"
85
- "bundle exec rake spec"
9-
106
branches:
117
only:
128
- master
13-
14-
env:
15-
- PUPPET_VERSION="~> 3.6.0"
16-
9+
matrix:
10+
- rvm: 1.9.3
11+
env: PUPPET_GEM_VERSION="~> 3.4.0"
12+
- rvm: 1.9.3
13+
env: PUPPET_GEM_VERSION="~> 3.6.0"
1714
notifications:
1815
email:
1916
recipients:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# phpldapadmin
22

3-
[![Build Status](https://travis-ci.org/Spantree/phpldapadmin.svg?branch=master)](https://travis-ci.org/Spantree/phpldapadmin) [![Coverage Status](https://img.shields.io/coveralls/Spantree/phpldapadmin.svg)](https://coveralls.io/r/Spantree/phpldapadmin?branch=master)
3+
[![Build Status](https://travis-ci.org/Spantree/puppet-phpldapadmin.svg?branch=master)](https://travis-ci.org/Spantree/puppet-phpldapadmin) [![Coverage Status](https://img.shields.io/coveralls/Spantree/puppet-phpldapadmin.svg)](https://coveralls.io/r/Spantree/puppet-phpldapadmin?branch=master)
44

55
Sebastian Otaegui <[email protected]>
66

Rakefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ require 'puppet-lint/tasks/puppet-lint'
33
require 'puppet-syntax/tasks/puppet-syntax'
44
require 'coveralls/rake/task'
55
require 'puppet_blacksmith/rake_tasks'
6+
require 'rake/clean'
67

78
exclude_paths = [
89
"spec/**/*.pp",
@@ -26,3 +27,5 @@ task :test => [
2627
:lint,
2728
:spec,
2829
]
30+
31+
CLEAN.include(exclude_paths, 'coverage')

manifests/init.pp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
#
2424
# === Examples
2525
#
26-
# class { phpldapadmin:
27-
# servers => [ 'pool.ntp.org', 'ntp.local.company.com' ],
28-
# }
26+
# class { 'phpldapadmin': }
2927
#
3028
# === Authors
3129
#

metadata.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "spantree-phpldapadmin",
3-
"version": "0.1.0",
3+
"version": "0.0.1",
44
"author": "spantree",
55
"summary": "Install and configure phpldapadmin",
66
"license": "Apache 2.0",
@@ -12,6 +12,26 @@
1212
"name": "puppetlabs-stdlib",
1313
"version_range": ">= 1.0.0"
1414
}
15+
],
16+
"operatingsystem_support": [
17+
{
18+
"operatingystem": "Debian",
19+
"operatingsystemrelease": [
20+
"6",
21+
"7"
22+
]
23+
},
24+
{
25+
"operatingsystem": "Ubuntu",
26+
"operatingsystemrelease": [
27+
"12.04",
28+
"14.04"
29+
]
30+
}
31+
],
32+
"requirements": [
33+
{ "name": "pe", "version_requirement": "3.2.x" },
34+
{ "name": "puppet", "version_requirement": "3.4.x" }
1535
]
1636
}
1737

0 commit comments

Comments
 (0)