Merge pull request #227 from jrafanie/test_ruby31

Add ruby 3.1 to the test matrix
ManageIQ · Jan 23, 2024 · c295d5c · c295d5c
2 parents 793a6dd + 5880670
commit c295d5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,6 +12,7 @@ jobs:
       matrix:
         ruby-version:
         - '3.0'
+        - '3.1'
         rails-version:
         - '6.1'
         - '7.0'

diff --git a/lib/manageiq/appliance_console/message_configuration.rb b/lib/manageiq/appliance_console/message_configuration.rb
@@ -110,7 +110,13 @@ def configure_messaging_yaml
 
         return if file_found?(messaging_yaml_path)
 
-        messaging_yaml = YAML.load_file(messaging_yaml_sample_path)
+        data = File.read(messaging_yaml_sample_path)
+        messaging_yaml =
+          if YAML.respond_to?(:safe_load)
+            YAML.safe_load(data, :aliases => true)
+          else
+            YAML.load(data) # rubocop:disable Security/YAMLLoad
+          end
 
         messaging_yaml["production"]["host"]      = message_server_host
         messaging_yaml["production"]["port"]      = message_server_port
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ jobs: @@
           matrix:
             ruby-version:
             - '3.0'
+            - '3.1'
             rails-version:
             - '6.1'
             - '7.0'
@@ Expand Down @@