From 2a4519ffd9064af3ef5418c0f1e5e658dba1172a Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Fri, 22 Nov 2019 22:24:14 -0800 Subject: [PATCH] devops: fix webkit build and cleanup on linux --- browser_patches/webkit/build.sh | 3 +++ browser_patches/webkit/clean.sh | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/browser_patches/webkit/build.sh b/browser_patches/webkit/build.sh index 571d8da1fa..eee83ed8fc 100755 --- a/browser_patches/webkit/build.sh +++ b/browser_patches/webkit/build.sh @@ -18,6 +18,9 @@ fi if [[ "$(uname)" == "Darwin" ]]; then ./Tools/Scripts/build-webkit --release elif [[ "$(uname)" == "Linux" ]]; then + if ! [[ -d ./WebKitBuild ]]; then + yes | DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitgtk-libs + fi ./Tools/Scripts/build-webkit --gtk --release MiniBrowser else echo "ERROR: cannot upload on this platform!" 1>&2 diff --git a/browser_patches/webkit/clean.sh b/browser_patches/webkit/clean.sh index 876e7828cf..87cd2a27eb 100755 --- a/browser_patches/webkit/clean.sh +++ b/browser_patches/webkit/clean.sh @@ -6,4 +6,6 @@ trap "cd $(pwd -P)" EXIT cd "$(dirname $0)" cd "checkout" -rm -rf WebKitBuild +if [[ -d ./WebKitBuild ]]; then + rm -rf ./WebKitBuild/Release +fi