From 9e27d140c3144860dcbd98c8c957a38e316fd0e3 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Fri, 17 Jan 2020 13:42:33 -0800 Subject: [PATCH] devops: rename minibrowser-linux into minibrowser-gtk This is a preparation for the minibrowser-wpe upcoming build. --- browser_patches/buildbots/README.md | 2 +- browser_patches/tools/check_cdn.sh | 4 ++-- browser_patches/upload.sh | 4 ++-- src/server/wkPlaywright.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browser_patches/buildbots/README.md b/browser_patches/buildbots/README.md index 0aed65ac26..4bda429af1 100644 --- a/browser_patches/buildbots/README.md +++ b/browser_patches/buildbots/README.md @@ -2,7 +2,7 @@ We currently have 4 build bots that produce the following builds - **[buildbot-linux]** Ubuntu 18.04 machine - - builds: `Webkit-Linux`, `Firefox-Linux` + - builds: `Webkit-gtk`, `Firefox-Linux` - **[buildbot-mac-10.14]** Mac 10.14 machine - builds: `WebKit-mac-10.14`, `Firefox-Mac` - **[buildbot-mac-10.15]** machine diff --git a/browser_patches/tools/check_cdn.sh b/browser_patches/tools/check_cdn.sh index 4bb1e2c355..b988770264 100755 --- a/browser_patches/tools/check_cdn.sh +++ b/browser_patches/tools/check_cdn.sh @@ -36,13 +36,13 @@ FFOX_ALIASES=( WK_REVISION=$(cat ../webkit/BUILD_NUMBER) WK_ARCHIVES=( - "$HOST/webkit/%s/minibrowser-linux.zip" + "$HOST/webkit/%s/minibrowser-gtk.zip" "$HOST/webkit/%s/minibrowser-mac-10.14.zip" "$HOST/webkit/%s/minibrowser-mac-10.15.zip" "$HOST/webkit/%s/minibrowser-win64.zip" ) WK_ALIASES=( - "WK-LINUX" + "WK-GTK" "WK-MAC-10.14" "WK-MAC-10.15" "WK-WIN64" diff --git a/browser_patches/upload.sh b/browser_patches/upload.sh index e69810bdd3..1d811f95cd 100755 --- a/browser_patches/upload.sh +++ b/browser_patches/upload.sh @@ -69,8 +69,8 @@ elif [[ ("$1" == "webkit") || ("$1" == "webkit/") ]]; then BLOB_NAME="minibrowser-mac-$MAC_MAJOR_MINOR_VERSION.zip" ALIAS="webkit-mac-$MAC_MAJOR_MINOR_VERSION r$BUILD_NUMBER" elif [[ "$(uname)" == "Linux" ]]; then - BLOB_NAME="minibrowser-linux.zip" - ALIAS="webkit-linux r$BUILD_NUMBER" + BLOB_NAME="minibrowser-gtk.zip" + ALIAS="webkit-gtk r$BUILD_NUMBER" elif [[ "$(uname)" == MINGW* ]]; then BLOB_NAME="minibrowser-win64.zip" ALIAS="webkit-win64 r$BUILD_NUMBER" diff --git a/src/server/wkPlaywright.ts b/src/server/wkPlaywright.ts index 28ee17f359..286448e621 100644 --- a/src/server/wkPlaywright.ts +++ b/src/server/wkPlaywright.ts @@ -195,7 +195,7 @@ export class WKPlaywright implements Playwright { _createBrowserFetcher(options?: BrowserFetcherOptions): BrowserFetcher { const downloadURLs = { - linux: '%s/builds/webkit/%s/minibrowser-linux.zip', + linux: '%s/builds/webkit/%s/minibrowser-gtk.zip', mac: '%s/builds/webkit/%s/minibrowser-mac-%s.zip', win64: '%s/builds/webkit/%s/minibrowser-win64.zip', };