Merge pull request #3354 from smortex/fix-ci-with-latest-yard

Fix with latest version of yard
puppetlabs · Oct 31, 2024 · 1ab766c · 1ab766c
2 parents ce9235a + c8c7574
commit 1ab766c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/acceptance/setup/common/pre-suite/010_install_ruby.rb b/acceptance/setup/common/pre-suite/010_install_ruby.rb
@@ -27,7 +27,6 @@
       # public_suffix for win requires Ruby version >= 2.6
       # current Ruby 2.5.0 works with public_suffix version 4.0.7
       on(bolt, powershell('gem install public_suffix -v 4.0.7'))
-      on(bolt, powershell('gem install yard -v 0.9.36'))
       # current Ruby 2.5.0 works with puppet-strings 2.9.0
       on(bolt, powershell('gem install puppet-strings -v 2.9.0'))
       # net-ssh 7.x no longer supports ruby 2.5
@@ -77,7 +76,6 @@
       on(bolt, 'gem install public_suffix -v 5.1.1 --no-document')
       on(bolt, 'gem install CFPropertyList -v 3.0.6 --no-document')
       on(bolt, 'gem install fast_gettext -v 2.4.0')
-      on(bolt, 'gem install yard -v 0.9.36 --no-document')
       # System ruby for osx12 is 2.6, which can only manage puppet-strings 2.9.0
       on(bolt, 'gem install puppet-strings -v 2.9.0 --no-document')
       # semantic puppet no longer supports ruby < 2.7

diff --git a/lib/bolt/pal.rb b/lib/bolt/pal.rb
@@ -498,7 +498,12 @@ def get_plan_info(plan_name, with_mtime: false)
         require 'puppet-strings'
         require 'puppet-strings/yard'
         PuppetStrings::Yard.setup!
-        YARD::Logger.instance.level = :error
+        YARD::Logger.instance.level = if YARD::Logger.const_defined?(:Severity)
+                                        YARD::Logger::Severity::ERROR
+                                      else
+                                        # Backward compatility for YARD < 0.9.37
+                                        YARD::Logger.instance.level = :error
+                                      end
         YARD.parse(pp_path)
 
         plan = YARD::Registry.at("puppet_plans::#{plan_name}")