Skip to content

Commit 31d6b99

Browse files
committed
(maint) Unify gemfile with other core modules
Pin puppet-module-posix-system and puppet-module-win-system to an older version since the newer ones do not bundle some gems that we use in acceptance (i.e. beaker-module_install_helper), causing tests to fail. Add puppet-strings since other core modules have it, and reorder some gems.
1 parent 8660c0b commit 31d6b99

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ group :development do
3232
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
3333
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
3434
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
35-
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
36-
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
35+
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
36+
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37+
gem "puppet-strings", require: false
3738
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
3839
end
40+
3941
group :system_tests do
40-
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
41-
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
42-
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
43-
gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~>1.0')
44-
gem "beaker-vmpooler", *location_for(ENV['BEAKER_VMPOOLER_VERSION'] || '~> 1.3')
42+
gem "puppet-module-posix-system-r#{minor_version}", '~> 0.5', require: false, platforms: [:ruby]
43+
gem "puppet-module-win-system-r#{minor_version}", '~> 0.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
44+
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4')
4545
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.5')
4646
gem "beaker-pe", require: false
4747
gem "beaker-hostgenerator"

0 commit comments

Comments
 (0)