Skip to content

Commit cb1a751

Browse files
committed
Merge pull request puppetlabs#140 from kbarber/maint/master/fix_travis_gem_versions
Fix versions for travis-ci
2 parents 10992e1 + 794ef22 commit cb1a751

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

.travis.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,30 @@ script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
44
rvm:
55
- 1.8.7
66
- 1.9.3
7+
- 2.0.0
78
- ruby-head
89
env:
9-
- PUPPET_GEM_VERSION="~> 2.6"
10-
- PUPPET_GEM_VERSION="~> 2.7"
11-
- PUPPET_GEM_VERSION="~> 3.0"
10+
- PUPPET_GEM_VERSION="~> 2.6.0"
11+
- PUPPET_GEM_VERSION="~> 2.7.0"
12+
- PUPPET_GEM_VERSION="~> 3.0.0"
13+
- PUPPET_GEM_VERSION="~> 3.1.0"
1214
matrix:
1315
allow_failures:
16+
- rvm: 2.0.0
1417
- rvm: ruby-head
18+
- env: PUPPET_GEM_VERSION="~> 2.6.0"
1519
exclude:
1620
- rvm: 1.9.3
17-
env: PUPPET_GEM_VERSION="~> 2.7"
21+
env: PUPPET_GEM_VERSION="~> 2.7.0"
22+
- rvm: 2.0.0
23+
env: PUPPET_GEM_VERSION="~> 2.7.0"
1824
- rvm: ruby-head
19-
env: PUPPET_GEM_VERSION="~> 2.7"
25+
env: PUPPET_GEM_VERSION="~> 2.7.0"
2026
- rvm: 1.9.3
21-
env: PUPPET_GEM_VERSION="~> 2.6"
27+
env: PUPPET_GEM_VERSION="~> 2.6.0"
28+
- rvm: 2.0.0
29+
env: PUPPET_GEM_VERSION="~> 2.6.0"
2230
- rvm: ruby-head
23-
env: PUPPET_GEM_VERSION="~> 2.6"
31+
env: PUPPET_GEM_VERSION="~> 2.6.0"
2432
notifications:
2533
email: false

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
source :rubygems
1+
source 'https://rubygems.org'
22

33
group :development, :test do
44
gem 'rake'

manifests/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
$custom_service_name = undef,
4444
$custom_user = undef,
4545
$custom_group = undef,
46-
$run_initdb = undef,
46+
$run_initdb = undef
4747
) {
4848
$user = pick($custom_user, 'postgres')
4949
$group = pick($custom_group, 'postgres')

manifests/pg_hba_rule.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
) {
1414
include postgresql::params
1515

16-
validate_re($type, ['^local$', '^host$', '^hostssl$', '^hostnossl$'],
16+
validate_re($type, '^(local|host|hostssl|hostnossl)$',
1717
"The type you specified [${type}] must be one of: local, host, hostssl, hostnosssl")
1818
validate_re($auth_method, '^(trust|reject|md5|crypt|password|gss|sspi|krb5|ident|peer|ldap|radius|cert|pam)$',
1919
"The auth_method you specified [${auth_method}] must be one of: trust, reject, md5, crypt, password, krb5, ident, ldap, pam")

0 commit comments

Comments
 (0)