diff --git a/.github/workflows/comment-lint.yml b/.github/workflows/comment-lint.yml
index b7f2b87a85..482899b835 100644
--- a/.github/workflows/comment-lint.yml
+++ b/.github/workflows/comment-lint.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   comment-lint:
-    if: ${{ github.repository_owner == 'oven-sh' && github.event.workflow_run.conclusion == 'success' }}
+    if: ${{ github.repository_owner == 'oven-sh' }}
     name: Comment
     runs-on: ubuntu-latest
     steps:
@@ -62,13 +62,14 @@ jobs:
           comment-id: ${{ steps.comment.outputs.comment-id }}
           issue-number: ${{ steps.env.outputs.pr-number }}
           body: |
-            @${{ github.actor }}, C++ linting failed!
+            @${{ github.actor }}, `clang-tidy` had something to share with you about your code:
 
-            Logs:
             ```cpp
             ${{ steps.env.outputs.text_output }}
             ```
 
+            Commit: ${{ github.event.workflow_run.head_sha || github.sha }}
+
             <!-- generated-comment lint-cpp-workflow=${{ github.workflow }} -->
           edit-mode: replace
       - name: Update Previous Comment
@@ -78,7 +79,7 @@ jobs:
           comment-id: ${{ steps.comment.outputs.comment-id }}
           issue-number: ${{ steps.env.outputs.pr-number }}
           body: |
-            @${{ github.actor }}, C++ lint errors fixed! Thank you.
+            @${{ github.actor }}, you fixed the clang-tidy nits! Thank you.
 
             <!-- generated-comment lint-cpp-workflow=${{ github.workflow }} -->
           edit-mode: replace
diff --git a/.github/workflows/run-lint-cpp.yml b/.github/workflows/run-lint-cpp.yml
index b1e78b3ec1..0f715e9f7a 100644
--- a/.github/workflows/run-lint-cpp.yml
+++ b/.github/workflows/run-lint-cpp.yml
@@ -79,3 +79,6 @@ jobs:
         with:
           name: did_fail.txt
           path: did_fail.txt
+      - name: Fail if formatting failed
+        if: ${{ steps.format.outputs.did_fail == '1' }}
+        run: exit 1