From aee1feee79c81429210216266d4acc4540e2982c Mon Sep 17 00:00:00 2001
From: Oscar Vestlie <oxv@google.com>
Date: Wed, 29 Jan 2025 22:12:54 +0000
Subject: [PATCH 1/2] Add check-json to pre-commit

---
 .pre-commit-config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e1b3296c4e0..0013bd59423 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,6 +27,7 @@ repos:
     -   id: check-case-conflict
     -   id: check-xml
     -   id: check-yaml
+    -   id: check-json
     -   id: end-of-file-fixer
     -   id: mixed-line-ending
     -   id: trailing-whitespace

From 268759eeb1d987235129b67fefbc84ca1337421e Mon Sep 17 00:00:00 2001
From: Oscar Vestlie <oxv@google.com>
Date: Wed, 29 Jan 2025 22:14:54 +0000
Subject: [PATCH 2/2] Add set -e in build steps

---
 .github/actions/build/action.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/build/action.yaml b/.github/actions/build/action.yaml
index 41fdc7b112b..a74fccf020a 100644
--- a/.github/actions/build/action.yaml
+++ b/.github/actions/build/action.yaml
@@ -53,7 +53,7 @@ runs:
           # TODO(b/382508397): Replace hardcoded list with dynamically generated one.
           TEST_TARGETS_JSON_FILE: cobalt/build/testing/targets/${{ matrix.platform }}/test_targets.json
         run: |
-          set -x
+          set -ex
           cd src
           time autoninja -C out/${{ matrix.platform }}_${{ matrix.config }} $(cat "${TEST_TARGETS_JSON_FILE}" | jq -cr '.test_targets | join(" ")')
         shell: bash
@@ -61,7 +61,7 @@ runs:
         env:
           TARGETS: ${{ inputs.targets }}
         run: |
-          set -x
+          set -ex
           cd src
           time autoninja -C out/${{ matrix.platform }}_${{ matrix.config }} ${TARGETS}
         shell: bash