fix matrix reports generation

ishigo974 · ishigo974 · commit bdcda35a60bd · 2025-08-23T00:40:17.000+02:00
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -33,19 +33,15 @@ jobs:
         run: bundle install
       - name: Run benchmarks
         run: bundle exec rake
-      - name: Generate HTML files for each benchmark
+      - name: Generate index.html for current Ruby version
         run: |
-          for v in $(ls reports); do
-            mkdir -p html_reports/$v
-            for f in $(ls reports/$v/*.txt); do
-              ruby scripts/generate_benchmarks_html.rb "$f" "html_reports/$v/$(basename $f .txt).html"
-            done
-          done
-      - name: Upload HTML reports as artifacts
+          v=${{ matrix.ruby-version }}
+          ruby scripts/merge_html_reports.rb $v
+      - name: Upload index.html as artifact
         uses: actions/upload-artifact@v4
         with:
           name: html-reports
-          path: html_reports/**/*
+          path: reports/${{ matrix.ruby-version }}/index.html
 
   publish:
     needs: rake
@@ -59,9 +55,9 @@ jobs:
         with:
           name: html-reports
           path: all_html_reports
-      - name: Merge all HTML files into one
+      - name: Generate listing page for all versions
         run: |
-          ruby scripts/merge_html_reports.rb all_html_reports merged_benchmarks.html
+          ruby scripts/generate_listing_page.rb all_html_reports index.html
           touch .nojekyll
       - name: Prepare gh-pages branch
         run: |
@@ -70,10 +66,11 @@ jobs:
           git fetch origin gh-pages || git checkout --orphan gh-pages
           git checkout gh-pages || git checkout --orphan gh-pages
           rm -rf *
-          cp merged_benchmarks.html ./
+          cp all_html_reports/*/index.html ./
+          cp index.html ./
           touch .nojekyll
-      - name: Commit and push merged HTML page
+      - name: Commit and push HTML pages
         run: |
           git add .
-          git commit -m "Update merged benchmark HTML [ci skip]" || echo "No changes to commit"
+          git commit -m "Update benchmark HTML pages [ci skip]" || echo "No changes to commit"
           git push origin gh-pages
diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,3 @@
-task :generate_versions_html do
-  ruby_script = File.expand_path('scripts/generate_versions_html.rb', Dir.pwd)
-  sh "ruby #{ruby_script}"
-end
 desc "run benchmark in current ruby"
 task :run_benchmark do
   require 'fileutils'
diff --git a/scripts/generate_listing_page.rb b/scripts/generate_listing_page.rb
@@ -0,0 +1,45 @@
+# scripts/generate_listing_page.rb
+# Generates an index.html listing all Ruby version benchmark pages found in the given directory.
+
+require 'pathname'
+require 'find'
+
+dir = ARGV[0] || 'all_html_reports'
+output = ARGV[1] || 'index.html'
+
+version_pages = []
+Find.find(dir) do |path|
+  if path =~ /\/index\.html$/
+    version = Pathname(path).each_filename.to_a[-2]
+    version_pages << [version, File.basename(path)]
+  end
+end
+
+version_pages.sort_by! { |v, _| v }
+
+links = version_pages.map do |version, file|
+  "<li><a href=\"#{version}/index.html\">Ruby #{version}</a></li>"
+end
+
+page = <<-HTML
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Ruby Benchmarks Index</title>
+  <style>
+    body { font-family: Arial, sans-serif; margin: 2em; }
+    ul { font-size: 1.2em; }
+  </style>
+</head>
+<body>
+  <h1>Ruby Benchmarks Index</h1>
+  <ul>
+    #{links.join("\n    ")}
+  </ul>
+</body>
+</html>
+HTML
+
+File.write(output, page)
+puts "Listing page written to #{output}"
diff --git a/scripts/generate_versions_html.rb b/scripts/generate_versions_html.rb
diff --git a/scripts/merge_html_reports.rb b/scripts/merge_html_reports.rb
@@ -4,26 +4,29 @@
 require 'find'
 require 'pathname'
 
-input_dir = ARGV[0] || 'all_html_reports'
-output = ARGV[1] || 'merged_benchmarks.html'
 
-html_files = []
-Find.find(input_dir) do |path|
-  html_files << path if path =~ /\.html$/
-end
+# Usage: ruby scripts/merge_html_reports.rb <ruby_version>
+version = ARGV[0] or abort("Usage: ruby scripts/merge_html_reports.rb <ruby_version>")
+input_dir = File.join('reports', version)
+
+output = File.join(input_dir, 'index.html')
+require 'fileutils'
+FileUtils.mkdir_p(input_dir)
+
+txt_files = Dir[File.join(input_dir, '*.txt')].sort
 
-blocks = html_files.sort.map do |file|
-  name = Pathname(file).each_filename.to_a[-2..-1].join(' / ')
+blocks = txt_files.map do |file|
+  name = File.basename(file, '.txt')
   content = File.read(file)
-  "<details><summary>#{name}</summary>\n#{content}\n</details>"
+  "<details><summary>#{name}</summary>\n<pre>#{content}</pre>\n</details>"
 end
 
 page = <<-HTML
 <!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <title>All Ruby Benchmarks</title>
+  <title>Ruby Benchmarks for #{version}</title>
   <style>
     body { font-family: Arial, sans-serif; margin: 2em; }
     details { margin-bottom: 1em; }
@@ -32,7 +35,7 @@
   </style>
 </head>
 <body>
-  <h1>All Ruby Benchmarks</h1>
+  <h1>Ruby Benchmarks for #{version}</h1>
   #{blocks.join("\n\n")}
 </body>
 </html>
