From 9d8bb1fd4442a27d2e08e02c92bf8a63b6a00ed7 Mon Sep 17 00:00:00 2001
From: Dan King <dan@spiraldb.com>
Date: Fri, 13 Dec 2024 13:29:19 -0500
Subject: [PATCH] fix: JSON must not have trailing commas (#1680)

The commit-metadata job also tolerated sub-shell failures.

I've already uploaded the missing commit entry (from the current tip) to
S3.
---
 .github/workflows/bench.yml | 5 ++++-
 scripts/commit-json.sh      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index 7e94d6ec0..df64d4fc9 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -23,8 +23,11 @@ jobs:
       - name: Upload Commit Metadata
         shell: bash
         run: |
+          set -Eeu -o pipefail -x
+
           sudo apt-get update && sudo apt-get install -y jq
-          bash scripts/cat-s3.sh vortex-benchmark-results-database commits.json <(bash scripts/commit-json.sh)
+          bash scripts/commit-json.sh > new-commit.json
+          bash scripts/cat-s3.sh vortex-benchmark-results-database commits.json new-commit.json
   bench:
     strategy:
       matrix:
diff --git a/scripts/commit-json.sh b/scripts/commit-json.sh
index e302d0914..0980488fd 100644
--- a/scripts/commit-json.sh
+++ b/scripts/commit-json.sh
@@ -29,6 +29,6 @@ jq --compact-output '.' <<EOF
     "message": "$commit_title",
     "timestamp": "$commit_timestamp",
     "tree_id": "$tree_id",
-    "url": "$repo_url/commit/$commit_id",
+    "url": "$repo_url/commit/$commit_id"
 }
 EOF