From d62080ff1ee67f2b5ac2d1a177897b6b3c0021e9 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Fri, 17 Jan 2020 16:55:42 -0800
Subject: [PATCH] devops: report upload build size via TG notification

---
 .../checkout_build_archive_upload.sh          | 59 +++++++++----------
 ... download_gtk_and_wpe_and_zip_together.sh} | 23 ++++++--
 2 files changed, 47 insertions(+), 35 deletions(-)
 rename browser_patches/webkit/{download_gtk_and_wpe_zip_together_and_upload.sh => download_gtk_and_wpe_and_zip_together.sh} (71%)

diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh
index f2615e3738..86cda817d2 100755
--- a/browser_patches/checkout_build_archive_upload.sh
+++ b/browser_patches/checkout_build_archive_upload.sh
@@ -124,40 +124,38 @@ source ./buildbots/send_telegram_message.sh
 LAST_COMMIT_MESSAGE=$(git log --format=%s -n 1 HEAD -- ./$BROWSER_NAME/BUILD_NUMBER)
 BUILD_ALIAS="<b>[[$BUILD_FLAVOR r$BUILD_NUMBER]]</b> $LAST_COMMIT_MESSAGE"
 
-if [[ "$BUILD_FLAVOR" == "webkit-gtk-wpe" ]]; then
-  send_telegram_message "$BUILD_ALIAS -- started ⏳"
-  if ! ./webkit/download_gtk_and_wpe_zip_together_and_upload.sh; then
-    send_telegram_message "$BUILD_ALIAS -- ./download_gtk_and_wpe_zip_together_and_upload.sh failed! ❌"
-    exit 1
-  fi
-  send_telegram_message "$BUILD_ALIAS -- uploaded ✅"
-  exit 0
-fi
-
 send_telegram_message "$BUILD_ALIAS -- started ⏳"
 
-echo "-- preparing checkout"
-if ! ./prepare_checkout.sh $BROWSER_NAME; then
-  send_telegram_message "$BUILD_ALIAS -- ./prepare_checkout.sh failed! ❌"
-  exit 1
-fi
+if [[ "$BUILD_FLAVOR" == "webkit-gtk-wpe" ]]; then
+  echo "-- combining binaries together"
+  if ! ./webkit/download_gtk_and_wpe_and_zip_together.sh $ZIP_PATH; then
+    send_telegram_message "$BUILD_ALIAS -- ./download_gtk_and_wpe_and_zip_together.sh failed! ❌"
+    exit 1
+  fi
+else
+  echo "-- preparing checkout"
+  if ! ./prepare_checkout.sh $BROWSER_NAME; then
+    send_telegram_message "$BUILD_ALIAS -- ./prepare_checkout.sh failed! ❌"
+    exit 1
+  fi
 
-echo "-- cleaning"
-if ! ./$BROWSER_NAME/clean.sh; then
-  send_telegram_message "$BUILD_ALIAS -- ./clean.sh failed! ❌"
-  exit 1
-fi
+  echo "-- cleaning"
+  if ! ./$BROWSER_NAME/clean.sh; then
+    send_telegram_message "$BUILD_ALIAS -- ./clean.sh failed! ❌"
+    exit 1
+  fi
 
-echo "-- building"
-if ! ./$BROWSER_NAME/build.sh "$EXTRA_BUILD_ARGS"; then
-  send_telegram_message "$BUILD_ALIAS -- ./build.sh failed! ❌"
-  exit 1
-fi
+  echo "-- building"
+  if ! ./$BROWSER_NAME/build.sh "$EXTRA_BUILD_ARGS"; then
+    send_telegram_message "$BUILD_ALIAS -- ./build.sh failed! ❌"
+    exit 1
+  fi
 
-echo "-- archiving to $ZIP_PATH"
-if ! ./$BROWSER_NAME/archive.sh $ZIP_PATH "$EXTRA_ARCHIVE_ARGS"; then
-  send_telegram_message "$BUILD_ALIAS -- ./archive.sh failed! ❌"
-  exit 1
+  echo "-- archiving to $ZIP_PATH"
+  if ! ./$BROWSER_NAME/archive.sh $ZIP_PATH "$EXTRA_ARCHIVE_ARGS"; then
+    send_telegram_message "$BUILD_ALIAS -- ./archive.sh failed! ❌"
+    exit 1
+  fi
 fi
 
 echo "-- uploading"
@@ -165,4 +163,5 @@ if ! ./upload.sh $BUILD_FLAVOR $ZIP_PATH; then
   send_telegram_message "$BUILD_ALIAS -- ./upload.sh failed! ❌"
   exit 1
 fi
-send_telegram_message "$BUILD_ALIAS -- uploaded ✅"
+UPLOAD_SIZE=$(du -h "$ZIP_PATH" | awk '{print $1}')
+send_telegram_message "$BUILD_ALIAS -- $UPLOAD_SIZE uploaded ✅"
diff --git a/browser_patches/webkit/download_gtk_and_wpe_zip_together_and_upload.sh b/browser_patches/webkit/download_gtk_and_wpe_and_zip_together.sh
similarity index 71%
rename from browser_patches/webkit/download_gtk_and_wpe_zip_together_and_upload.sh
rename to browser_patches/webkit/download_gtk_and_wpe_and_zip_together.sh
index c1713def21..05897e67a2 100755
--- a/browser_patches/webkit/download_gtk_and_wpe_zip_together_and_upload.sh
+++ b/browser_patches/webkit/download_gtk_and_wpe_and_zip_together.sh
@@ -3,7 +3,7 @@ set -e
 set +x
 
 if [[ ("$1" == "-h") || ("$1" == "--help") ]]; then
-  echo "usage: $(basename $0)"
+  echo "usage: $(basename $0) [ZIP-PATH]"
   echo
   echo "Generate a single .zip archive that contains both gtk and wpe builds"
   echo
@@ -16,6 +16,23 @@ if [[ "$(uname)" != "Linux" ]]; then
   exit 1
 fi
 
+ZIP_PATH="$1"
+if [[ $ZIP_PATH != /* ]]; then
+  echo "ERROR: path $ZIP_PATH is not absolute"
+  exit 1
+fi
+if [[ $ZIP_PATH != *.zip ]]; then
+  echo "ERROR: path $ZIP_PATH must have .zip extension"
+  exit 1
+fi
+if [[ -f $ZIP_PATH ]]; then
+  echo "ERROR: path $ZIP_PATH exists; can't do anything."
+  exit 1
+fi
+if ! [[ -d $(dirname $ZIP_PATH) ]]; then
+  echo "ERROR: folder for path $($ZIP_PATH) does not exist."
+  exit 1
+fi
 
 trap "cd $(pwd -P)" EXIT
 cd "$(dirname "$0")"
@@ -24,7 +41,6 @@ cd "$(dirname "$0")"
 TMPDIR=$(mktemp -d -t webkit-deploy-XXXXXXXXXX)
 GTK_ZIP_PATH=$(mktemp -t -u minibrowser-gtk-XXXXXX.zip)
 WPE_ZIP_PATH=$(mktemp -t -u minibrowser-wpe-XXXXXX.zip)
-ZIP_PATH=$(mktemp -t -u minibrowser-gtk-wpe-XXXXXX.zip)
 ../download.sh webkit-gtk $GTK_ZIP_PATH
 ../download.sh webkit-wpe $WPE_ZIP_PATH
 
@@ -61,6 +77,3 @@ popd
 rm -rf $TMPDIR
 rm -rf $WPE_ZIP_PATH
 rm -rf $GTK_ZIP_PATH
-
-../upload.sh webkit-gtk-wpe $ZIP_PATH
-rm -rf $ZIP_PATH