A platform for community discussion. Free, open, simple.
DEV: Fix UC status report when reverted files encountered (#41821)
Martin Brennan67d24109195a
diff --git a/lib/upcoming_changes/status_report.rb b/lib/upcoming_changes/status_report.rbindex 77004966501..3e17609b914 100644--- a/lib/upcoming_changes/status_report.rb+++ b/lib/upcoming_changes/status_report.rb@@ -44,11 +44,19 @@ module UpcomingChangesenddef show_file(commit_sha, path)+ return if !file_exists_at?(commit_sha, path)+capture("show", "#{commit_sha}:#{path}")endprivate+ def file_exists_at?(commit_sha, path)+ _stdout, _stderr, status =+ Open3.capture3("git", "-C", @repo_path, "cat-file", "-e", "#{commit_sha}:#{path}")+ status.success?+ end+def capture(*args)stdout, stderr, status = Open3.capture3("git", "-C", @repo_path, *args)return stdout if status.success?diff --git a/script/generate_upcoming_change_status_report b/script/generate_upcoming_change_status_reportindex 80e3f5b024e..9e95c77fb12 100755--- a/script/generate_upcoming_change_status_report+++ b/script/generate_upcoming_change_status_report@@ -13,18 +13,23 @@ cat /tmp/upcoming_changes_status_report.jsoneligible_count="$(ruby -rjson -e 'records = JSON.parse(File.read(ARGV.fetch(0))); puts records.count { |record| record["eligible"] }' /tmp/upcoming_changes_status_report.json)"-echo "eligible_count=${eligible_count}" >> "${GITHUB_OUTPUT}"-{- echo "### Upcoming change status report"- echo- echo "- Dry run: \`${dry_run}\`"- echo "- Stale after days: \`${stale_after_days}\`"- echo "- Eligible changes: \`${eligible_count}\`"- echo- ruby -rjson -e '- JSON.parse(File.read(ARGV.fetch(0))).select { |record| record["eligible"] }.each do |record|- puts "- `#{record["name"]}`: `#{record["current_status"]}` -> `#{record["next_status"]}` in `#{record["settings_path"]}`; last changed #{record["days_since_status_change"]} days ago"- end- ' /tmp/upcoming_changes_status_report.json-} >> "${GITHUB_STEP_SUMMARY}"\ No newline at end of file+if [ -n "${GITHUB_OUTPUT:-}" ]; then+ echo "eligible_count=${eligible_count}" >> "${GITHUB_OUTPUT}"+fi++if [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then+ {+ echo "### Upcoming change status report"+ echo+ echo "- Dry run: \`${dry_run}\`"+ echo "- Stale after days: \`${stale_after_days}\`"+ echo "- Eligible changes: \`${eligible_count}\`"+ echo+ ruby -rjson -e '+ JSON.parse(File.read(ARGV.fetch(0))).select { |record| record["eligible"] }.each do |record|+ puts "- `#{record["name"]}`: `#{record["current_status"]}` -> `#{record["next_status"]}` in `#{record["settings_path"]}`; last changed #{record["days_since_status_change"]} days ago"+ end+ ' /tmp/upcoming_changes_status_report.json+ } >> "${GITHUB_STEP_SUMMARY}"+fidiff --git a/spec/script/upcoming_changes_status_report_spec.rb b/spec/script/upcoming_changes_status_report_spec.rbindex 5e01f815d41..87846cb112b 100644--- a/spec/script/upcoming_changes_status_report_spec.rb+++ b/spec/script/upcoming_changes_status_report_spec.rb@@ -35,6 +35,22 @@ RSpec.describe UpcomingChanges::StatusReport doauthor_email: "[email protected]",)+ remove_plugin_settings+ commit_shas[:plugin_removed] = commit(+ "DEV: Remove plugin settings",+ date: "2026-04-15T12:00:00Z",+ author_name: "Alice Example",+ author_email: "[email protected]",+ )++ write_plugin_settings("plugin_alpha_change" => "alpha")+ commit_shas[:plugin_restored] = commit(+ "DEV: Restore plugin settings",+ date: "2026-04-20T12:00:00Z",+ author_name: "Alice Example",+ author_email: "[email protected]",+ )+write_settings("experimental_change" => "experimental","alpha_change" => "alpha",@@ -129,6 +145,7 @@ RSpec.describe UpcomingChanges::StatusReport donext_status: "beta",eligible: true,original_commit: commit_shas[:original],+ last_status_change_commit: commit_shas[:original],)endend@@ -230,4 +247,8 @@ RSpec.describe UpcomingChanges::StatusReport doendendend++ def remove_plugin_settings+ FileUtils.rm_rf(File.join(repo_path, "plugins/chat"))+ endend