diff --git a/.github/workflows/weekly_board_conflicts.yaml b/.github/workflows/weekly_board_conflicts.yaml
index c6c96a38a4..96422eabb1 100644
--- a/.github/workflows/weekly_board_conflicts.yaml
+++ b/.github/workflows/weekly_board_conflicts.yaml
@@ -21,6 +21,9 @@ jobs:
 
       - name: Run full-file conflict check
         id: check
+        # shell: bash runs with -o pipefail so the script's exit code is not
+        # masked by `tee` in the pipeline.
+        shell: bash
         run: ./Tools/check_board_types_conflicts.sh | tee conflict_output.txt
 
       # If the sweep failed, open a tracking issue or append to the existing