devops: add signature to BUILD_NUMBER to force rebaseline (#2810)

Currently, it might happen that two different patches clash for the
same build number for the browsers. In this case, authors might
not even know that they need to rebaseline.

This patch starts adding a second line to `BUILD_NUMBER` files - the
signature and date of the `BUILD_NUMBER` change. These are guaranteed
to clash, so it should not be possible to land patches without
re-baselining them.

browser_patches/checkout_build_archive_upload.sh

@@ -115,7 +115,7 @@ if [[ -f $ZIP_PATH ]]; then
 fi
 trap "rm -rf ${ZIP_PATH}; rm -rf ${LOG_PATH}; cd $(pwd -P);" INT TERM EXIT
 cd "$(dirname "$0")"
-BUILD_NUMBER=$(cat ./$BROWSER_NAME/BUILD_NUMBER)
+BUILD_NUMBER=$(head -1 ./$BROWSER_NAME/BUILD_NUMBER)
 BUILD_BLOB_PATH="${BROWSER_NAME}/${BUILD_NUMBER}/${BUILD_BLOB_NAME}"
 LOG_BLOB_NAME="${BUILD_BLOB_NAME%.zip}.log.gz"
 LOG_BLOB_PATH="${BROWSER_NAME}/${BUILD_NUMBER}/${LOG_BLOB_NAME}"

browser_patches/download.sh

@@ -42,7 +42,7 @@ else
   exit 1
 fi
 
-BUILD_NUMBER=$(cat ./$BROWSER_NAME/BUILD_NUMBER)
+BUILD_NUMBER=$(head -1 ./$BROWSER_NAME/BUILD_NUMBER)
 BLOB_PATH="$BROWSER_NAME/$BUILD_NUMBER/$BLOB_NAME"
 
 if [[ $# < 2 ]]; then

browser_patches/export.sh

@@ -119,7 +119,7 @@ NEW_BASE_REVISION=$(git merge-base $REMOTE_BROWSER_UPSTREAM/$BASE_BRANCH $CURREN
 NEW_DIFF=$(git diff --diff-algorithm=myers --full-index $NEW_BASE_REVISION $CURRENT_BRANCH -- . ":!${EXTRA_FOLDER_CHECKOUT_RELPATH}")
 
 # Increment BUILD_NUMBER
-BUILD_NUMBER=$(curl ${BUILD_NUMBER_UPSTREAM_URL})
+BUILD_NUMBER=$(curl ${BUILD_NUMBER_UPSTREAM_URL} | head -1)
 BUILD_NUMBER=$((BUILD_NUMBER+1))
 
 echo "REMOTE_URL=\"$REMOTE_URL\"
@@ -127,6 +127,7 @@ BASE_BRANCH=\"$BASE_BRANCH\"
 BASE_REVISION=\"$NEW_BASE_REVISION\"" > $EXPORT_PATH/UPSTREAM_CONFIG.sh
 echo "$NEW_DIFF" > $EXPORT_PATH/patches/$PATCH_NAME
 echo $BUILD_NUMBER > $EXPORT_PATH/BUILD_NUMBER
+echo "Changed: $(git config user.email) $(date)" >> $EXPORT_PATH/BUILD_NUMBER
 
 echo "-- exporting standalone folder"
 rm -rf "${EXTRA_FOLDER_PW_PATH}"

browser_patches/firefox/BUILD_NUMBER

@@ -1 +1,2 @@
-1120
+1121
+Changed: lushnikov@chromium.org Wed Jul  2 12:02:52 PDT 2020

browser_patches/prepare_checkout.sh

@@ -38,14 +38,14 @@ if [[ ("$1" == "firefox") || ("$1" == "firefox/") || ("$1" == "ff") ]]; then
   CHECKOUT_PATH="$PWD/firefox/checkout"
   PATCHES_PATH="$PWD/firefox/patches"
   FIREFOX_EXTRA_FOLDER_PATH="$PWD/firefox/juggler"
-  BUILD_NUMBER=$(cat "$PWD/firefox/BUILD_NUMBER")
+  BUILD_NUMBER=$(head -1 "$PWD/firefox/BUILD_NUMBER")
   source "./firefox/UPSTREAM_CONFIG.sh"
 elif [[ ("$1" == "webkit") || ("$1" == "webkit/") || ("$1" == "wk") ]]; then
   FRIENDLY_CHECKOUT_PATH="//browser_patches/webkit/checkout";
   CHECKOUT_PATH="$PWD/webkit/checkout"
   PATCHES_PATH="$PWD/webkit/patches"
   WEBKIT_EXTRA_FOLDER_PATH="$PWD/webkit/embedder/Playwright"
-  BUILD_NUMBER=$(cat "$PWD/webkit/BUILD_NUMBER")
+  BUILD_NUMBER=$(head -1 "$PWD/webkit/BUILD_NUMBER")
   source "./webkit/UPSTREAM_CONFIG.sh"
 else
   echo ERROR: unknown browser - "$1"

browser_patches/tools/check_cdn.sh

@@ -21,7 +21,7 @@ cd "$(dirname "$0")"
 
 HOST="https://playwright2.blob.core.windows.net/builds"
 
-FFOX_REVISION=$(cat ../firefox/BUILD_NUMBER)
+FFOX_REVISION=$(head -1 ../firefox/BUILD_NUMBER)
 FFOX_ARCHIVES=(
   "$HOST/firefox/%s/firefox-mac.zip"
   "$HOST/firefox/%s/firefox-linux.zip"
@@ -35,7 +35,7 @@ FFOX_ALIASES=(
   "FF-WIN64"
 )
 
-WK_REVISION=$(cat ../webkit/BUILD_NUMBER)
+WK_REVISION=$(head -1 ../webkit/BUILD_NUMBER)
 WK_ARCHIVES=(
   "$HOST/webkit/%s/minibrowser-gtk.zip"
   "$HOST/webkit/%s/minibrowser-wpe.zip"

browser_patches/webkit/BUILD_NUMBER

@@ -1 +1,2 @@
-1299
+1300
+Changed: lushnikov@chromium.org Wed Jul  2 12:02:52 PDT 2020