various little fixes

spiraldb · Dec 13, 2024 · 6223ac9 · 6223ac9
1 parent 6f42892
commit 6223ac9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/bench-pr.yml b/.github/workflows/bench-pr.yml
@@ -87,13 +87,16 @@ jobs:
             > base.json
 
           echo '# Benchmarks: ${{ matrix.benchmark.id }}' > comment.md
+          echo '<details>' >> comment.md
+          echo '<summary>Table of Results</summary>' >> comment.md
           uv run python3 scripts/compare-benchmark-jsons.py base.json ${{ matrix.benchmark.id }}.json \
             >> comment.md
+          echo '</details>' >> comment.md
       - name: Comment PR
         uses: thollander/actions-comment-pull-request@v3
         with:
           file-path: comment.md
-          comment-tag: execution
+          comment-tag: bench-pr-comment-${{ matrix.benchmark.id }}
   tpch:
     needs: label_trigger
     runs-on: self-hosted
@@ -139,13 +142,16 @@ jobs:
             > base.json
 
           echo '# Benchmarks: TPC-H' > comment.md
+          echo '<details>' >> comment.md
+          echo '<summary>Table of Results</summary>' >> comment.md
           uv run python3 scripts/compare-benchmark-jsons.py base.json tpch.json \
             >> comment.md
+          echo '</details>' >> comment.md
       - name: Comment PR
         uses: thollander/actions-comment-pull-request@v3
         with:
           file-path: comment.md
-          comment-tag: execution
+          comment-tag: bench-pr-comment-tpch
   clickbench:
     needs: label_trigger
     runs-on: self-hosted
@@ -192,10 +198,13 @@ jobs:
             > base.json
 
           echo '# Benchmarks: Clickbench' > comment.md
+          echo '<details>' >> comment.md
+          echo '<summary>Table of Results</summary>' >> comment.md
           uv run python3 scripts/compare-benchmark-jsons.py base.json clickbench.json \
             >> comment.md
+          echo '</details>' >> comment.md
       - name: Comment PR
         uses: thollander/actions-comment-pull-request@v3
         with:
           file-path: comment.md
-          comment-tag: execution
+          comment-tag: bench-pr-comment-clickbench
diff --git a/scripts/coerce-criterion-json.sh b/scripts/coerce-criterion-json.sh
@@ -2,7 +2,7 @@
 
 set -Eeu -o pipefail -x
 
-commit_id=${GITHUB_HEAD_REF:-$GITHUB_SHA} # Prefer the PR tip SHA if this is a PR (not the merged SHA)
+commit_id=${GITHUB_SHA}
 
 jq --compact-output 'select(.reason == "benchmark-complete" or .reason == null)
     | if (.throughput | length) == 0