Merge pull request #5148 from galaxyproject/yamlloadfix

[GitHub Actions] fix yaml loading for ruby 3.1+
galaxyproject · Jul 9, 2024 · adc86b9 · adc86b9
2 parents 88f732a + 873d836
commit adc86b9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/bin/google-form-event.rb b/bin/google-form-event.rb
@@ -5,6 +5,7 @@
 require 'net/http'
 require 'csv'
 require 'date'
+require './_plugins/util'
 
 # Fetch data from a google sheet
 url = 'https://docs.google.com/spreadsheets/d/1LTShstcORXf_zB06naOfPzisAoOcik-xJvgK5LQCGP8/export?format=tsv'
@@ -33,7 +34,7 @@
 
   # Don't overwrite existing posts
   if File.exist?(filename)
-    other_file = YAML.load_file(filename)
+    other_file = safe_load_yaml(filename)
     if other_file['google_form_id'] == post_date.to_time.to_i
       STDERR.puts "Skipping #{filename} as it already exists"
       next

diff --git a/bin/google-form-faq.rb b/bin/google-form-faq.rb
@@ -5,6 +5,7 @@
 require 'net/http'
 require 'csv'
 require 'date'
+require './_plugins/util'
 
 # Fetch data from a google sheet
 url = 'https://docs.google.com/spreadsheets/d/1RFF3G9_bP8EpfACBk8lnF-Ib43ZGGAMm3ewPwW7eFT0/export?format=tsv'
@@ -27,7 +28,7 @@
 
   # Don't overwrite existing posts
   if File.exist?(filename)
-    other_file = YAML.load_file(filename)
+    other_file = safe_load_yaml(filename)
     if other_file['google_form_id'] == post_date.to_time.to_i
       STDERR.puts "Skipping #{filename} as it already exists"
       next

diff --git a/bin/google-form-recordings.rb b/bin/google-form-recordings.rb
@@ -5,6 +5,7 @@
 require 'net/http'
 require 'csv'
 require 'date'
+require './_plugins/util'
 
 # Fetch data from a google sheet
 url = 'https://docs.google.com/spreadsheets/d/1iXjLlMEH5QMAMyUMHi1c_Lb7OiJhL_9hgJrtAsBoZ-Y/export?format=tsv'
@@ -61,7 +62,7 @@
                         "bot-timestamp" => bot_timestamp }
 
   # append metadata into GTN material
-  material_metadata = YAML.load_file(material_file)
+  material_metadata = safe_load_yaml(material_file)
 
   if material_metadata["recordings"]
     # check the "bot_timestamp"