From b08d3dc9ff54d1db38d3150bbff6972283c7e6c4 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Mon, 26 Oct 2020 21:53:27 -0700
Subject: [PATCH] devops: always ensure linux deps when building webkit (#4249)

---
 browser_patches/checkout_build_archive_upload.sh |  2 ++
 browser_patches/webkit/build.sh                  | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh
index cceb5d8edb..a40214e3cb 100755
--- a/browser_patches/checkout_build_archive_upload.sh
+++ b/browser_patches/checkout_build_archive_upload.sh
@@ -109,11 +109,13 @@ elif [[ "$BUILD_FLAVOR" == "firefox-win64" ]]; then
   BUILD_BLOB_NAME="firefox-win64.zip"
 elif [[ "$BUILD_FLAVOR" == "webkit-ubuntu-18.04" ]]; then
   BROWSER_NAME="webkit"
+  EXTRA_BUILD_ARGS="--full"
   EXPECTED_HOST_OS="Ubuntu"
   EXPECTED_HOST_OS_VERSION="18.04"
   BUILD_BLOB_NAME="webkit-ubuntu-18.04.zip"
 elif [[ "$BUILD_FLAVOR" == "webkit-ubuntu-20.04" ]]; then
   BROWSER_NAME="webkit"
+  EXTRA_BUILD_ARGS="--full"
   EXPECTED_HOST_OS="Ubuntu"
   EXPECTED_HOST_OS_VERSION="20.04"
   BUILD_BLOB_NAME="webkit-ubuntu-20.04.zip"
diff --git a/browser_patches/webkit/build.sh b/browser_patches/webkit/build.sh
index c225b7213c..c7284522a1 100755
--- a/browser_patches/webkit/build.sh
+++ b/browser_patches/webkit/build.sh
@@ -27,6 +27,13 @@ build_wpe() {
   WEBKIT_JHBUILD=1 WEBKIT_JHBUILD_MODULESET=minimal WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/WPE ./Tools/Scripts/build-webkit --wpe --release "${CMAKE_ARGS}" --touch-events --orientation-events --no-bubblewrap-sandbox MiniBrowser
 }
 
+ensure_linux_deps() {
+  yes | DEBIAN_FRONTEND=noninteractive ./Tools/gtk/install-dependencies
+  yes | DEBIAN_FRONTEND=noninteractive ./Tools/wpe/install-dependencies
+  yes | DEBIAN_FRONTEND=noninteractive WEBKIT_JHBUILD=1 WEBKIT_JHBUILD_MODULESET=minimal WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/WPE ./Tools/Scripts/update-webkitwpe-libs
+  yes | DEBIAN_FRONTEND=noninteractive WEBKIT_JHBUILD=1 WEBKIT_JHBUILD_MODULESET=minimal WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/GTK ./Tools/Scripts/update-webkitgtk-libs
+}
+
 if [[ "$(uname)" == "Darwin" ]]; then
   cd "checkout"
   ./Tools/Scripts/build-webkit --release --touch-events --orientation-events
@@ -38,6 +45,13 @@ elif [[ "$(uname)" == "Linux" ]]; then
     echo
     build_wpe
     build_gtk
+  elif [[ "$1" == "--full" ]]; then
+    echo
+    echo BUILDING: GTK and WPE
+    echo
+    ensure_linux_deps
+    build_wpe
+    build_gtk
   elif [[ "$1" == "--gtk" ]]; then
     echo
     echo BUILDING: GTK