From a22446658c95b888e5f0bde425030626daeae1bc Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Tue, 2 Aug 2022 01:01:40 -0700 Subject: [PATCH] devops: fix azure cli installation on ubuntu arm (#16131) Turns out inistalling Azure CLI with `pip3` requires `gcc` installed. --- browser_patches/docker_build.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/browser_patches/docker_build.sh b/browser_patches/docker_build.sh index 44143b02d6..4780309d62 100755 --- a/browser_patches/docker_build.sh +++ b/browser_patches/docker_build.sh @@ -138,6 +138,10 @@ function ensure_docker_container { zip \ unzip + if [[ "${BUILD_FLAVOR}" == *"-arm64" ]]; then + apt-get install -y clang-12 + fi + # Ubuntu 18 installs Python 3.6 as Python3 by default; this, however, # fails to run Firefox build scripts. # Install Python3.8 instead on Ubuntu 18.04 as Python3. @@ -167,6 +171,8 @@ function ensure_docker_container { # Install AZ CLI with Python since they do not ship # aarch64 to APT: https://github.com/Azure/azure-cli/issues/7368 # Pin so future releases dont break us. + # Note: azure-cli requires gcc to be installed on arm64 ubuntu. + apt-get install -y gcc pip3 install azure-cli==2.38.0 fi @@ -186,10 +192,6 @@ function ensure_docker_container { apt-get install -y gcc-8 g++-8 fi - if [[ "${BUILD_FLAVOR}" == *"-arm64" ]]; then - apt-get install -y clang-12 - fi - git config --system user.email "you@example.com" git config --system user.name "Your Name"