devops: teach {firefox,webkit}/build.sh to build current branch

The check for the proper branch has moved to
`checkout_build_archive_upload.sh` script.
This commit is contained in:
Andrey Lushnikov 2019-12-09 14:38:23 -08:00
parent b6e518399c
commit cb92cd0d5c
3 changed files with 7 additions and 18 deletions

View File

@ -63,6 +63,13 @@ fi
echo "-- preparing checkout" echo "-- preparing checkout"
./prepare_checkout.sh $BROWSER_NAME ./prepare_checkout.sh $BROWSER_NAME
cd ./$BROWSER_NAME/checkout
if ! [[ $(git rev-parse --abbrev-ref HEAD) == "playwright-build" ]]; then
echo "ERROR: Default branch is not playwright-build!"
exit 1
fi
cd -
echo "-- cleaning" echo "-- cleaning"
./$BROWSER_NAME/clean.sh ./$BROWSER_NAME/clean.sh

View File

@ -6,15 +6,6 @@ trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)" cd "$(dirname $0)"
cd "checkout" cd "checkout"
BUILD_BRANCH="playwright-build"
if ! [[ $(git rev-parse --abbrev-ref HEAD) == "$BUILD_BRANCH" ]]; then
echo "ERROR: Cannot build any branch other than $BUILD_BRANCH"
exit 1;
else
echo "-- checking git branch is $BUILD_BRANCH - OK"
fi
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
# Firefox currently does not build on 10.15 out of the box - it requires SDK for 10.14. # Firefox currently does not build on 10.15 out of the box - it requires SDK for 10.14.
# Make sure the SDK is out there. # Make sure the SDK is out there.

View File

@ -6,15 +6,6 @@ trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)" cd "$(dirname $0)"
cd "checkout" cd "checkout"
BUILD_BRANCH="playwright-build"
if ! [[ $(git rev-parse --abbrev-ref HEAD) == "$BUILD_BRANCH" ]]; then
echo "ERROR: Cannot build any branch other than $BUILD_BRANCH"
exit 1;
else
echo "-- checking git branch is $BUILD_BRANCH - OK"
fi
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
./Tools/Scripts/build-webkit --release ./Tools/Scripts/build-webkit --release
elif [[ "$(uname)" == "Linux" ]]; then elif [[ "$(uname)" == "Linux" ]]; then