Revert "Disable litmus when Ruby 3"

This reverts commit 57e6de9985.

Reason for revert:
The new bolt 3.23.0, which is compatible with Ruby 3,  was released.

Change-Id: I306110131000cc29b58e0c2a8f17037286b8004b
This commit is contained in:
Takashi Kajinami 2022-06-07 17:19:46 +09:00
parent b803e2484a
commit dd267853f3
2 changed files with 3 additions and 13 deletions

View File

@ -3,11 +3,7 @@ require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
require 'puppet-syntax/tasks/puppet-syntax'
require 'metadata-json-lint/rake_task'
begin
require 'puppet_litmus/rake_tasks'
rescue LoadError
# In case puppet_litmus does not support the OS (eg. CentOS Stream 9)
end
require 'puppet_litmus/rake_tasks'
require 'json'
modname = JSON.parse(open('metadata.json').read)['name'].split('-')[1]

View File

@ -50,13 +50,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'pathspec', ['< 1.0.0']
end
# NOTE(tkajinam): The latest bolt does not support Ruby 3 yet. Disable litmus
# so that we can run unit tests in CentOS Stream 9 which has
# Ruby 3.
if RUBY_VERSION < '3.0.0'
spec.add_dependency 'bolt'
spec.add_dependency 'puppet_litmus', ['0.33.2']
end
spec.add_dependency 'bolt'
spec.add_dependency 'puppet_litmus'
spec.add_dependency 'serverspec'
end