diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 56ec2527..dcb79c00 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,17 @@ jobs:
           python ./build.py macchiato --all-accents --zip -d $PWD/releases > macchiato.log 2>&1 &
           python ./build.py frappe --all-accents --zip -d $PWD/releases > frappe.log 2>&1 &
           python ./build.py latte --all-accents --zip -d $PWD/releases > latte.log 2>&1 &
-          wait
+
+          set -e
+          declare -i err=0 werr=0
+          while wait -fn || werr=$?; ((werr != 127)); do
+            err=$werr
+            if [[ $err -ne 0 ]]; then
+              echo "Build failure, abort"
+              cat *.log
+              exit 1
+            fi
+          done
 
           cat *.log
 
diff --git a/sources/build/context.py b/sources/build/context.py
index 259fcc77..3d43c019 100644
--- a/sources/build/context.py
+++ b/sources/build/context.py
@@ -59,7 +59,6 @@ def apply_tweak(self, key, default, value):
             Subsitution(find=f"\\${key}: {default}", replace=f"${key}: {value}"),
         )
 
-
 IS_DARK = Suffix(true_value="-Dark", test=lambda ctx: ctx.flavor.dark)
 IS_LIGHT = Suffix(true_value="-Light", test=lambda ctx: not ctx.flavor.dark)
 IS_WINDOW_NORMAL = Suffix(