Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2025-02-16 22:18:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Ruby 2.7 Bundle Installs on CI Verify Pipeline (#6324)

Browse source 
* We will never be on 2.6 again

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>

* Only run html-proofer test on Ruby 3

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>

* Pin to chef 16 on ruby 2.7, 17+ on Ruby 3

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
This commit is contained in:
Clinton Wolfe 2022-11-27 17:57:20 -05:00 • committed by GitHub
parent 95cd68bd3c
commit d27d981b33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Gemfile
View file

@ -25,7 +25,6 @@ end
group :test do
gem "chefstyle", "~> 2.0.3"
gem "concurrent-ruby", "~> 1.0"
gem "html-proofer", "~> 3.19.4", platforms: :ruby # do not attempt to run proofer on windows. Pinned to 3.19.4 as test is breaking in updated versions.
gem "json_schemer", ">= 0.2.1", "< 0.2.19"
gem "m"
gem "minitest-sprint", "~> 1.0"
@ -39,26 +38,30 @@ group :test do
gem "simplecov", "~> 0.21"
gem "simplecov_json_formatter"
gem "webmock", "~> 3.0"
if Gem.ruby_version >= Gem::Version.new("3.0.0")
# html-proofer has a dep on io-event, which is ruby-3 only
gem "html-proofer", "~> 3.19.4", platforms: :ruby # do not attempt to run proofer on windows. Pinned to 3.19.4 as test is breaking in updated versions.
end
end
group :deploy do
gem "inquirer"
end
# Only include Test Kitchen support if we are on Ruby 2.7 or higher
# as chef-zero support requires Ruby 2.6
# See https://github.com/inspec/inspec/pull/5341
if Gem.ruby_version >= Gem::Version.new("2.7.0")
group :kitchen do
gem "berkshelf"
gem "chef", ">= 16.0" # Required to allow net-ssh > 6
gem "test-kitchen", ">= 2.8"
gem "kitchen-inspec", ">= 2.0"
gem "kitchen-dokken", ">= 2.11"
gem "git"
end
end
group :kitchen do
gem "berkshelf"
if Gem.ruby_version < Gem::Version.new("2.7.0")
gem "activesupport", "6.1.4.4"
# Chef 18 requires ruby 3
if Gem.ruby_version >= Gem::Version.new("3.0.0")
gem "chef", ">= 17.0"
else
# Ruby 2.7 presumably - TODO remove this when 2.7 is sunsetted
gem "chef", "~> 16.0"
end
gem "test-kitchen", ">= 2.8"
gem "kitchen-inspec", ">= 2.0"
gem "kitchen-dokken", ">= 2.11"
gem "git"
end

3
lib/plugins/inspec-reporter-html2/test/functional/inspec_reporter_html2_test.rb
View file

@ -24,6 +24,9 @@ describe "inspec-reporter-html2" do
# and we really only need to verify this on one platform
return if is_windows?
# html-proofer relies on io-event, which is ruby-3 only
skip unless Gem.ruby_version >= Gem::Version.new("3.0.0")
require "html-proofer"
proofer_opts = {