From e3045fee4404006256e8b4167327975e6f9a4572 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Tue, 8 Dec 2020 20:27:11 -0600 Subject: [PATCH] devops: add ability to skip architecture enforcement Github self-hosted runners currently run under rosetta: https://github.com/actions/runner/issues/805 This patch is an attempt to build arm webkit from-inside rosetta shell on arm hardware. --- browser_patches/checkout_build_archive_upload.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh index 04c581c3d5b89..0d561c2c70e6a 100755 --- a/browser_patches/checkout_build_archive_upload.sh +++ b/browser_patches/checkout_build_archive_upload.sh @@ -151,7 +151,9 @@ else exit 1 fi -if [[ "$CURRENT_ARCH" != "$EXPECTED_ARCH" ]]; then +# Ability to skip arch checks since as of Dec 8, 2020 github self-hosted runner runs +# under rosetta on Apple Silicon: https://github.com/actions/runner/issues/805 +if [[ (-n "${DO_NOT_ENFORCE_ARCH}") || ("$CURRENT_ARCH" != "$EXPECTED_ARCH") ]]; then echo "ERROR: cannot build $BUILD_FLAVOR" echo " -- expected arch: $EXPECTED_ARCH" echo " -- current arch: $CURRENT_ARCH"