Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

devops: fix docker builds (#15987)

Browse source 
* install AZ CLI from pip since it's not available in APT on aarch64
* install rust for firefox as `pwuser`
This commit is contained in:
Andrey Lushnikov 2022-07-27 04:59:53 -07:00 committed by GitHub
parent 54f7141877
commit f82ce805da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
browser_patches/docker_build.sh
View file

@ -154,14 +154,17 @@ function ensure_docker_container {
# Install AZ CLI on CI only # Install AZ CLI on CI only
if [[ -n "${CI}" ]]; then if [[ -n "${CI}" ]]; then
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash # Install AZ CLI with Python since they do not ship
# aarch64 to APT: https://github.com/Azure/azure-cli/issues/7368
#
# NOTE: 2.34.0 fails to upload with --content-md5: https://github.com/Azure/azure-cli/issues/21494
# So pin to 2.33.1
pip install azure-cli==2.33.1
fi fi
if [[ "${BUILD_FLAVOR}" == "firefox-"* ]]; then if [[ "${BUILD_FLAVOR}" == "firefox-"* ]]; then
# install rust as a pwuser # install rust as a pwuser
su pwuser su -l pwuser -c 'curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y'
curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
exit
echo "PATH=\"${PATH}:/home/pwuser/.cargo/bin\"" > /etc/environment echo "PATH=\"${PATH}:/home/pwuser/.cargo/bin\"" > /etc/environment
elif [[ "${BUILD_FLAVOR}" == "webkit-ubuntu-18.04" ]]; then elif [[ "${BUILD_FLAVOR}" == "webkit-ubuntu-18.04" ]]; then
# Ubuntu 18.04 specific: update CMake. Default CMake on Ubuntu 18.04 is 3.10, whereas WebKit requires 3.12+. # Ubuntu 18.04 specific: update CMake. Default CMake on Ubuntu 18.04 is 3.10, whereas WebKit requires 3.12+.