Skip to content

Commit dd9c312

Browse files
authored
devops: start producing WebKit builds for Apple Silicon (#4643)
\m/
1 parent 64a2940 commit dd9c312

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

browser_patches/checkout_build_archive_upload.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ if [[ $# == 0 ]]; then
2121
exit 1
2222
fi
2323

24+
CURRENT_ARCH="$(uname -m)"
2425
CURRENT_HOST_OS="$(uname)"
2526
CURRENT_HOST_OS_VERSION=""
2627
if [[ "$CURRENT_HOST_OS" == "Darwin" ]]; then
@@ -36,6 +37,7 @@ BUILD_FLAVOR="$1"
3637
BUILD_BLOB_NAME=""
3738
EXPECTED_HOST_OS=""
3839
EXPECTED_HOST_OS_VERSION=""
40+
EXPECTED_ARCH="x86_64"
3941
if [[ "$BUILD_FLAVOR" == "winldd-win64" ]]; then
4042
BROWSER_NAME="winldd"
4143
EXPECTED_HOST_OS="MINGW"
@@ -138,11 +140,24 @@ elif [[ "$BUILD_FLAVOR" == "webkit-mac-11.0" ]]; then
138140
EXPECTED_HOST_OS="Darwin"
139141
EXPECTED_HOST_OS_VERSION="11.0"
140142
BUILD_BLOB_NAME="webkit-mac-11.0.zip"
143+
elif [[ "$BUILD_FLAVOR" == "webkit-mac-11.0-arm64" ]]; then
144+
BROWSER_NAME="webkit"
145+
EXPECTED_HOST_OS="Darwin"
146+
EXPECTED_HOST_OS_VERSION="11.0"
147+
EXPECTED_ARCH="arm64"
148+
BUILD_BLOB_NAME="webkit-mac-11.0-arm64.zip"
141149
else
142150
echo ERROR: unknown build flavor - "$BUILD_FLAVOR"
143151
exit 1
144152
fi
145153

154+
if [[ "$CURRENT_ARCH" != "$EXPECTED_ARCH" ]]; then
155+
echo "ERROR: cannot build $BUILD_FLAVOR"
156+
echo " -- expected arch: $EXPECTED_ARCH"
157+
echo " -- current arch: $CURRENT_ARCH"
158+
exit 1
159+
fi
160+
146161
if [[ "$CURRENT_HOST_OS" != $EXPECTED_HOST_OS* ]]; then
147162
echo "ERROR: cannot build $BUILD_FLAVOR"
148163
echo " -- expected OS: $EXPECTED_HOST_OS"

browser_patches/tools/check_cdn.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@ WK_ARCHIVES=(
4141
"$HOST/webkit/%s/webkit-ubuntu-20.04.zip"
4242
"$HOST/webkit/%s/webkit-mac-10.14.zip"
4343
"$HOST/webkit/%s/webkit-mac-10.15.zip"
44+
"$HOST/webkit/%s/webkit-mac-11.0-arm64.zip"
4445
"$HOST/webkit/%s/webkit-win64.zip"
4546
)
4647
WK_ALIASES=(
4748
"WK-UBUNTU-18.04"
4849
"WK-UBUNTU-20.04"
4950
"WK-MAC-10.14"
5051
"WK-MAC-10.15"
52+
"WK-MAC-11.0-ARM64"
5153
"WK-WIN64"
5254
)
5355

browser_patches/webkit/BUILD_NUMBER

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1401
2-
Changed: [email protected] Tue Dec 8 12:36:33 CST 2020
1+
1402
2+
Changed: [email protected] Tue Dec 8 18:35:08 CST 2020

0 commit comments

Comments
 (0)