Skip to content

Commit

Permalink
devops: start producing WebKit builds for Apple Silicon (microsoft#4643)
Browse files Browse the repository at this point in the history
\m/
  • Loading branch information
aslushnikov committed Dec 9, 2020
1 parent 64a2940 commit dd9c312
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
15 changes: 15 additions & 0 deletions browser_patches/checkout_build_archive_upload.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ if [[ $# == 0 ]]; then
exit 1
fi

CURRENT_ARCH="$(uname -m)"
CURRENT_HOST_OS="$(uname)"
CURRENT_HOST_OS_VERSION=""
if [[ "$CURRENT_HOST_OS" == "Darwin" ]]; then
Expand All @@ -36,6 +37,7 @@ BUILD_FLAVOR="$1"
BUILD_BLOB_NAME=""
EXPECTED_HOST_OS=""
EXPECTED_HOST_OS_VERSION=""
EXPECTED_ARCH="x86_64"
if [[ "$BUILD_FLAVOR" == "winldd-win64" ]]; then
BROWSER_NAME="winldd"
EXPECTED_HOST_OS="MINGW"
Expand Down Expand Up @@ -138,11 +140,24 @@ elif [[ "$BUILD_FLAVOR" == "webkit-mac-11.0" ]]; then
EXPECTED_HOST_OS="Darwin"
EXPECTED_HOST_OS_VERSION="11.0"
BUILD_BLOB_NAME="webkit-mac-11.0.zip"
elif [[ "$BUILD_FLAVOR" == "webkit-mac-11.0-arm64" ]]; then
BROWSER_NAME="webkit"
EXPECTED_HOST_OS="Darwin"
EXPECTED_HOST_OS_VERSION="11.0"
EXPECTED_ARCH="arm64"
BUILD_BLOB_NAME="webkit-mac-11.0-arm64.zip"
else
echo ERROR: unknown build flavor - "$BUILD_FLAVOR"
exit 1
fi

if [[ "$CURRENT_ARCH" != "$EXPECTED_ARCH" ]]; then
echo "ERROR: cannot build $BUILD_FLAVOR"
echo " -- expected arch: $EXPECTED_ARCH"
echo " -- current arch: $CURRENT_ARCH"
exit 1
fi

if [[ "$CURRENT_HOST_OS" != $EXPECTED_HOST_OS* ]]; then
echo "ERROR: cannot build $BUILD_FLAVOR"
echo " -- expected OS: $EXPECTED_HOST_OS"
Expand Down
2 changes: 2 additions & 0 deletions browser_patches/tools/check_cdn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@ WK_ARCHIVES=(
"$HOST/webkit/%s/webkit-ubuntu-20.04.zip"
"$HOST/webkit/%s/webkit-mac-10.14.zip"
"$HOST/webkit/%s/webkit-mac-10.15.zip"
"$HOST/webkit/%s/webkit-mac-11.0-arm64.zip"
"$HOST/webkit/%s/webkit-win64.zip"
)
WK_ALIASES=(
"WK-UBUNTU-18.04"
"WK-UBUNTU-20.04"
"WK-MAC-10.14"
"WK-MAC-10.15"
"WK-MAC-11.0-ARM64"
"WK-WIN64"
)

Expand Down
4 changes: 2 additions & 2 deletions browser_patches/webkit/BUILD_NUMBER
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1401
Changed: aslushnikov@gmail.com Tue Dec 8 12:36:33 CST 2020
1402
Changed: aslushnikov@gmail.com Tue Dec 8 18:35:08 CST 2020

0 comments on commit dd9c312

Please sign in to comment.