From fa8de9961161b1ec8218c7f126bd1e1d68fb802c Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Fri, 4 Sep 2020 00:43:12 -0700 Subject: [PATCH] Revert "devops: revision Chromium repackaged builds separately (#3698)" (#3763) This reverts commit fcc1680f989f79e07a0e4ef4ba399f609fc388da. --- browser_patches/chromium/BUILD_NUMBER | 2 +- browser_patches/chromium/UPSTREAM_CONFIG.sh | 1 - browser_patches/chromium/build.sh | 5 ++--- 3 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 browser_patches/chromium/UPSTREAM_CONFIG.sh diff --git a/browser_patches/chromium/BUILD_NUMBER b/browser_patches/chromium/BUILD_NUMBER index 83b33d238dab9..fc076b6c45712 100644 --- a/browser_patches/chromium/BUILD_NUMBER +++ b/browser_patches/chromium/BUILD_NUMBER @@ -1 +1 @@ -1000 +799610 diff --git a/browser_patches/chromium/UPSTREAM_CONFIG.sh b/browser_patches/chromium/UPSTREAM_CONFIG.sh deleted file mode 100644 index 3aff46e47c20d..0000000000000 --- a/browser_patches/chromium/UPSTREAM_CONFIG.sh +++ /dev/null @@ -1 +0,0 @@ -UPSTREAM_CHROMIUM_REVISION=792639 diff --git a/browser_patches/chromium/build.sh b/browser_patches/chromium/build.sh index 955b37ff2ae02..521e2d8ab5f8f 100755 --- a/browser_patches/chromium/build.sh +++ b/browser_patches/chromium/build.sh @@ -5,11 +5,10 @@ set +x trap "cd $(pwd -P)" EXIT cd "$(dirname $0)" -source "./UPSTREAM_CONFIG.sh" - mkdir -p output cd output +BUILD_NUMBER=$(head -1 ../BUILD_NUMBER) FOLDER_NAME="" ZIP_NAME="" FILES_TO_REMOVE=() @@ -33,7 +32,7 @@ else exit 1 fi -URL="https://storage.googleapis.com/chromium-browser-snapshots/${FOLDER_NAME}/${UPSTREAM_CHROMIUM_REVISION}/${ZIP_NAME}" +URL="https://storage.googleapis.com/chromium-browser-snapshots/${FOLDER_NAME}/${BUILD_NUMBER}/${ZIP_NAME}" curl --output upstream.zip "${URL}" unzip upstream.zip