Skip to content

Commit 083cc1c

Browse files
committed
modulesync 1.9.3
1 parent e10fda6 commit 083cc1c

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '1.9.2'
1+
modulesync_config_version: '1.9.3'

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ matrix:
3131
- rvm: 2.5.1
3232
bundler_args: --without development release
3333
dist: trusty
34-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker} CHECK=beaker
34+
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker} CHECK=beaker
3535
services: docker
3636
sudo: required
3737
- rvm: 2.5.1
3838
bundler_args: --without development release
3939
dist: trusty
40-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker} CHECK=beaker
40+
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker} CHECK=beaker
4141
services: docker
4242
sudo: required
4343
branches:

Gemfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
1111
end
1212

1313
group :test do
14-
gem 'puppetlabs_spec_helper', '~> 2.6.0', :require => false
14+
gem 'puppetlabs_spec_helper', '~> 2.6', :require => false
1515
gem 'rspec-puppet', '~> 2.5', :require => false
1616
gem 'rspec-puppet-facts', :require => false
1717
gem 'rspec-puppet-utils', :require => false
@@ -55,13 +55,16 @@ group :system_tests do
5555
gem 'beaker-hostgenerator', '>= 1.1.10', :require => false
5656
gem 'beaker-puppet_install_helper', :require => false
5757
gem 'beaker-module_install_helper', :require => false
58+
gem 'rbnacl', '~> 4', :require => false if RUBY_VERSION >= '2.2.6'
59+
gem 'rbnacl-libsodium', :require => false if RUBY_VERSION >= '2.2.6'
60+
gem 'bcrypt_pbkdf', :require => false
5861
end
5962

6063
group :release do
6164
gem 'github_changelog_generator', :require => false, :git => 'https://github.com/skywinder/github-changelog-generator' if RUBY_VERSION >= '2.2.2'
6265
gem 'puppet-blacksmith', :require => false
6366
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
64-
gem 'puppet-strings', '~> 1.0', :require => false
67+
gem 'puppet-strings', '>= 1.0', :require => false
6568
end
6669

6770

0 commit comments

Comments
 (0)