fix(ci): skip schema-only changed config fetch tests

Author: gildesmarais

bin/rspec_changed_configs

@@ -1,18 +1,34 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-changed_files = `git diff --name-only origin/master | grep 'lib/html2rss/configs/.*/.*.yml'`.split("\n")
-
-if changed_files.any?
-  # Use dynamic test file with environment variable to filter changed configs
-  config_names = changed_files.map { |file| file.sub('lib/html2rss/configs/', '') }
-
-  # Test each changed config individually
-  config_names.each do |config_name|
-    puts "Testing changed config: #{config_name}"
-    system("bundle exec rspec --example '#{config_name}' --tag fetch spec/html2rss/configs_dynamic_spec.rb")
-  end
-else
-  puts 'No changed config files found'
+CONFIG_PATH = %r{\Alib/html2rss/configs/.+/.+\.yml\z}
+SCHEMA_MODELINE = /\A[+-]# yaml-language-server: \$schema=/
+
+def comment_only_change?(file)
+  diff_lines = `git diff --unified=0 origin/master -- #{file}`.lines
+  changed_lines = diff_lines.select { |line| line.start_with?('+', '-') }
+  content_lines = changed_lines.reject { |line| line.start_with?('+++', '---') }
+
+  content_lines.any? && content_lines.all? { |line| line.match?(SCHEMA_MODELINE) }
+end
+
+changed_files = `git diff --name-only origin/master`
+  .split("\n")
+  .grep(CONFIG_PATH)
+
+test_files = changed_files.reject { |file| comment_only_change?(file) }
+
+if test_files.empty?
+  puts 'No changed config files require fetch tests'
   exit 0
 end
+
+failed = false
+
+test_files.each do |file|
+  config_name = file.sub('lib/html2rss/configs/', '')
+  puts "Testing changed config: #{config_name}"
+  failed ||= !system("bundle exec rspec --example '#{config_name}' --tag fetch spec/html2rss/configs_dynamic_spec.rb")
+end
+
+exit 1 if failed

bin/validate_configs

@@ -9,28 +9,26 @@ files = Dir['lib/html2rss/configs/**/*.yml']
 failed = []
 
 files.each do |file|
-  begin
-    config = YAML.safe_load_file(file, symbolize_names: true)
-    result = Html2rss::Config.validate(config)
+  config = YAML.safe_load_file(file, symbolize_names: true)
+  result = Html2rss::Config.validate(config)
 
-    if result.success?
-      puts "ok   #{file}"
-    else
-      puts "FAIL #{file}"
-      result.errors.to_h.each do |key, messages|
-        Array(messages).each { |msg| warn "       #{key}: #{msg}" }
-      end
-      failed << file
-    end
-  rescue Psych::Exception => e
-    puts "FAIL #{file}"
-    warn "       parse: #{e.message}"
-    failed << file
-  rescue StandardError => e
+  if result.success?
+    puts "ok   #{file}"
+  else
     puts "FAIL #{file}"
-    warn "       validation: #{e.class}: #{e.message}"
+    result.errors.to_h.each do |key, messages|
+      Array(messages).each { |msg| warn "       #{key}: #{msg}" }
+    end
     failed << file
   end
+rescue Psych::Exception => error
+  puts "FAIL #{file}"
+  warn "       parse: #{error.message}"
+  failed << file
+rescue StandardError => error
+    puts "FAIL #{file}"
+  warn "       validation: #{error.class}: #{error.message}"
+  failed << file
 end
 
 puts

lib/html2rss/configs/espn.com/f1.yml

@@ -1,12 +1,10 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/html2rss/html2rss/refs/heads/master/schema/html2rss-config.schema.json
-strategy: default
 channel:
   url: https://www.espn.com/f1/
   time_zone: UTC
   ttl: 60
 selectors:
   items:
-    s: 'dfd'
     selector: ".headlineStack__list > li"
   title:
     selector: "a"