From f50e4842f06d06d670d20f0bc00f1c79d5fdc2d0 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Fri, 19 Feb 2021 15:34:21 -0700
Subject: [PATCH 1/2] devops: fix nits in browser compilation infrastructure

This patch:
- makes sure that failed runs actually show as failed in GHA
- attempts to use MINGW's `du` and `awk` to get upload size
---
 browser_patches/checkout_build_archive_upload.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh
index 71f9c5d95ce59..1a8e02b6c2d8a 100755
--- a/browser_patches/checkout_build_archive_upload.sh
+++ b/browser_patches/checkout_build_archive_upload.sh
@@ -311,12 +311,12 @@ send_telegram_message "$BUILD_ALIAS -- started"
 
 if generate_and_upload_browser_build 2>&1 | ./sanitize_and_compress_log.js $LOG_PATH; then
   # Report successful build. Note: we don't know how to get zip size on MINGW.
-  if [[ $(uname) == MINGW* ]]; then
-    send_telegram_message "$BUILD_ALIAS -- uploaded"
-  else
-    UPLOAD_SIZE=$(du -h "$ZIP_PATH" | awk '{print $1}')
-    send_telegram_message "$BUILD_ALIAS -- $UPLOAD_SIZE uploaded"
+  UPLOAD_SIZE=""
+  if command -v du >/dev/null && command -v awk >/dev/null; then
+    UPLOAD_SIZE="$(du -h "$ZIP_PATH" | awk '{print $1}') "
   fi
+  send_telegram_message "$BUILD_ALIAS -- $UPLOAD_SIZE uploaded"
+
   # Check if we uploaded the last build.
   if ./tools/check_cdn.sh $BROWSER_NAME --has-all-builds; then
     LAST_COMMIT_MESSAGE=$(git log --format=%s -n 1 HEAD -- ./$BROWSER_NAME/BUILD_NUMBER)
@@ -344,5 +344,6 @@ else
   # Upload logs only in case of failure and report failure.
   ./upload.sh ${LOG_BLOB_PATH} ${LOG_PATH} || true
   send_telegram_message "$BUILD_ALIAS -- ${FAILED_STEP} failed! ❌ <a href='https://playwright.azureedge.net/builds/${LOG_BLOB_PATH}'>${LOG_BLOB_NAME}</a>"
+  exit 1
 fi
 

From f42fe02cd0b050c244ea9385a71d7365bdbca6d1 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Fri, 19 Feb 2021 15:42:59 -0700
Subject: [PATCH 2/2] nit

---
 browser_patches/checkout_build_archive_upload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh
index 1a8e02b6c2d8a..67cc1d897a099 100755
--- a/browser_patches/checkout_build_archive_upload.sh
+++ b/browser_patches/checkout_build_archive_upload.sh
@@ -315,7 +315,7 @@ if generate_and_upload_browser_build 2>&1 | ./sanitize_and_compress_log.js $LOG_
   if command -v du >/dev/null && command -v awk >/dev/null; then
     UPLOAD_SIZE="$(du -h "$ZIP_PATH" | awk '{print $1}') "
   fi
-  send_telegram_message "$BUILD_ALIAS -- $UPLOAD_SIZE uploaded"
+  send_telegram_message "$BUILD_ALIAS -- ${UPLOAD_SIZE}uploaded"
 
   # Check if we uploaded the last build.
   if ./tools/check_cdn.sh $BROWSER_NAME --has-all-builds; then