Merge pull request #643 from MDA2AV/simplify-round-meta

Simplify rounds metadata to avoid so many conflicts

Author: MDA2AV

scripts/archive.sh

@@ -44,8 +44,11 @@ print(max(ids) if ids else 0)
 
     DATE=$(date +%Y-%m-%d)
 
-    # Read system info from current.json (written by benchmark.sh --save)
+    # Read system info from current.json (written by benchmark.sh --save).
+    # commit is intentionally NOT in current.json anymore (it churned per PR
+    # and dominated merge conflicts); always derive it from git directly.
     CURRENT_JSON="$SITE_DATA/current.json"
+    COMMIT=$(git -C "$ROOT_DIR" rev-parse --short HEAD 2>/dev/null || echo "unknown")
     if [ -f "$CURRENT_JSON" ]; then
         CPU=$(python3 -c "import json; print(json.load(open('$CURRENT_JSON')).get('cpu','unknown'))")
         CORES=$(python3 -c "import json; print(json.load(open('$CURRENT_JSON')).get('cores','unknown'))")
@@ -58,7 +61,6 @@ print(max(ids) if ids else 0)
         KERNEL=$(python3 -c "import json; print(json.load(open('$CURRENT_JSON')).get('kernel','unknown'))")
         DOCKER=$(python3 -c "import json; print(json.load(open('$CURRENT_JSON')).get('docker','unknown'))")
         DOCKER_RUNTIME=$(python3 -c "import json; print(json.load(open('$CURRENT_JSON')).get('docker_runtime','unknown'))")
-        COMMIT=$(python3 -c "import json; print(json.load(open('$CURRENT_JSON')).get('commit','unknown'))")
     else
         echo "Warning: site/data/current.json not found — run benchmark.sh --save first"
         CPU=$(lscpu 2>/dev/null | awk -F: '/Model name/ {gsub(/^[ \t]+/, "", $2); print $2; exit}')
@@ -76,7 +78,6 @@ print(max(ids) if ids else 0)
         KERNEL=$(uname -r)
         DOCKER=$(docker version --format '{{.Server.Version}}' 2>/dev/null || echo "unknown")
         DOCKER_RUNTIME=$(docker info --format '{{.DefaultRuntime}}' 2>/dev/null || echo "unknown")
-        COMMIT=$(git -C "$ROOT_DIR" rev-parse --short HEAD 2>/dev/null || echo "unknown")
     fi
 
     # Bundle all result data into one JSON

scripts/rebuild_site_data.py

@@ -19,7 +19,6 @@
 import os
 import subprocess
 import sys
-from datetime import date
 from pathlib import Path
 
 
@@ -211,7 +210,6 @@ def sysctl(key: str) -> str | None:
     kernel = run(["uname", "-r"])
     docker_ver = run(["docker", "version", "--format", "{{.Server.Version}}"])
     docker_runtime = run(["docker", "info", "--format", "{{.DefaultRuntime}}"])
-    commit = run(["git", "-C", str(root), "rev-parse", "--short", "HEAD"])
 
     lo_mtu = None
     try:
@@ -225,8 +223,12 @@ def sysctl(key: str) -> str | None:
     except Exception:
         pass
 
+    # date and commit were intentionally dropped — they churned on every
+    # /benchmark --save run and were the dominant source of merge conflicts
+    # between concurrent PRs. archive.sh re-derives commit from git directly
+    # at archive time; the displayed badge for the "current" round is hidden
+    # in round-selector.html when the field is absent.
     out: dict = {
-        "date": date.today().isoformat(),
         "cpu": cpu,
         "cores": cores,
         "threads": threads,
@@ -237,7 +239,6 @@ def sysctl(key: str) -> str | None:
         "docker": docker_ver,
         "docker_runtime": docker_runtime,
         "governor": governor,
-        "commit": commit,
     }
     if ram_speed != "unknown":
         out["ram_speed"] = ram_speed

site/layouts/shortcodes/round-selector.html

@@ -109,8 +109,15 @@
       return;
     }
 
-    // Always visible: commit + CPU
-    commitEl.innerHTML = iconGit + ' <code style="font-size:0.75rem;background:rgba(124,58,237,0.08);padding:0.1rem 0.35rem;border-radius:3px;">' + meta.commit + '</code>';
+    // Always visible: CPU. Commit is shown for archived rounds only — the
+    // "current" round no longer carries a commit field (it churned per PR
+    // and was the dominant source of merge conflicts).
+    if (meta.commit) {
+      commitEl.innerHTML = iconGit + ' <code style="font-size:0.75rem;background:rgba(124,58,237,0.08);padding:0.1rem 0.35rem;border-radius:3px;">' + meta.commit + '</code>';
+      commitEl.style.display = '';
+    } else {
+      commitEl.style.display = 'none';
+    }
     var ramInfo = meta.cores + 'C/' + (meta.threads || meta.cores) + 'T';
     ramInfo += ', ' + meta.ram + ' RAM';
     if (meta.ram_speed) ramInfo += ' @ ' + meta.ram_speed;