aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2021-07-14 12:46:05 -0700
committerGitHub <noreply@github.com>2021-07-14 12:46:05 -0700
commit957d2024b8d6ef44164559645dd898c306066964 (patch)
tree7efb14324d139bc22556cdf9d3896469a5846399 /scripts
parentd369df7ecf194005eaca46f07368779cd486badd (diff)
downloadvcpkg-957d2024b8d6ef44164559645dd898c306066964.tar.gz
vcpkg-957d2024b8d6ef44164559645dd898c306066964.zip
Update to Ubuntu 20.04. (#18892)
* Update Ubuntu to 20.04. * [tfhe] Disable -Wall -Werror * [sophus] Disable -Werror. * Fix typo in deployment of CUDA. * Add libxxf86vm-dev for opensubdiv. * [opensubdiv] Fix OpenCL search on Ubuntu 20.04, and document libxxf86vm-dev dependency * [msgpack11] Disable -Werror. * [qtwayland, qt5wayland] Add system library notice. * Add python-is-python3 to unbreak tensorflow, v8, and others * [graphqlparser] Remove directive rejected by Bison 3.5.1 * [ogdf] Mark as failing in ci.baseline.txt. Issue filed https://github.com/microsoft/vcpkg/issues/18936 * [bde] Mark failing in ci.baseline.txt, issue filed https://github.com/microsoft/vcpkg/issues/18937 * [soem] Patch out -Werror * Update pool.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/azure-pipelines/azure-pipelines.yml2
-rwxr-xr-xscripts/azure-pipelines/linux/create-vmss.ps14
-rwxr-xr-xscripts/azure-pipelines/linux/provision-image.sh23
-rw-r--r--scripts/ci.baseline.txt18
4 files changed, 23 insertions, 24 deletions
diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index 12d3ffd92..43d729a42 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -3,7 +3,7 @@
#
variables:
windows-pool: 'PrWin-2021-07-09'
- linux-pool: 'PrLin-2021-06-11'
+ linux-pool: 'PrLin-2021-07-13'
osx-pool: 'PrOsx-2021-04-16'
stages:
diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1
index 2bfaae2f0..52ce23774 100755
--- a/scripts/azure-pipelines/linux/create-vmss.ps1
+++ b/scripts/azure-pipelines/linux/create-vmss.ps1
@@ -225,8 +225,8 @@ $VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id
$VM = Set-AzVMSourceImage `
-VM $VM `
-PublisherName 'Canonical' `
- -Offer 'UbuntuServer' `
- -Skus '18.04-LTS' `
+ -Offer '0001-com-ubuntu-server-focal' `
+ -Skus '20_04-lts' `
-Version latest
$VM = Set-AzVMBootDiagnostic -VM $VM -Disable
diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh
index 5336e86f6..66d8fe932 100755
--- a/scripts/azure-pipelines/linux/provision-image.sh
+++ b/scripts/azure-pipelines/linux/provision-image.sh
@@ -8,7 +8,7 @@ sudo apt -y dist-upgrade
# Install common build dependencies
APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \
build-essential g++ gfortran zip libx11-dev libxkbcommon-x11-dev libxi-dev \
- libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev \
+ libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev \
libxcursor-dev yasm libnuma1 libnuma-dev python-six python3-six python-yaml \
flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \
xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \
@@ -39,8 +39,17 @@ APT_PACKAGES="$APT_PACKAGES python3-pip"
# Additionally required by rtaudio
APT_PACKAGES="$APT_PACKAGES libasound2-dev"
+# Additionally required by qtwebengine
+APT_PACKAGES="$APT_PACKAGES nodejs"
+
+# Additionally required by qtwayland
+APT_PACKAGES="$APT_PACKAGES libwayland-dev"
+
+# Additionally required by all GN projects
+APT_PACKAGES="$APT_PACKAGES python2 python-is-python3"
+
# Additionally required/installed by Azure DevOps Scale Set Agents
-APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu60"
+APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66"
sudo apt -y install $APT_PACKAGES
@@ -58,16 +67,16 @@ cd ~
curl -sSL https://get.haskellstack.org/ | sudo sh
# Install CUDA
-wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin
-sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600
-sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub
-sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /"
+wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin
+sudo mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600
+sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub
+sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /"
sudo apt -y update
sudo apt install -y --no-install-recommends cuda-compiler-11-3 cuda-libraries-dev-11-3 cuda-driver-dev-11-3 \
cuda-cudart-dev-11-3 libcublas-11-3 libcurand-dev-11-3 libcudnn8-dev libnccl2 libnccl-dev
# Install PowerShell
-wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
+wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
sudo dpkg -i packages-microsoft-prod.deb
sudo apt update
sudo add-apt-repository universe
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 3c705195b..8d6ac650b 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -52,6 +52,8 @@ azure-storage-cpp:arm64-windows=fail
aubio:arm-uwp=fail
aubio:x64-uwp=fail
+# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937
+bde:x64-linux=fail
blend2d:arm64-windows=fail
blend2d:arm-uwp=fail
blend2d:x64-uwp=fail
@@ -1066,6 +1068,8 @@ ogdf:x64-windows = skip
ogdf:x64-windows-static = skip
ogdf:x64-windows-static-md=skip
ogdf:x86-windows = skip
+# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18936
+ogdf:x64-linux=fail
ogre:x64-osx=fail
# Conflicts with ogre
ogre-next:arm64-windows = skip
@@ -1290,11 +1294,6 @@ qt5-canvas3d:x86-windows=skip
# Missing system libraries
qt5-wayland:x64-osx=fail
qtwayland:x64-osx=fail
-# Missing libraries
-qt5-wayland:x86-windows=fail
-qt5-wayland:x64-windows=fail
-qt5-wayland:x64-windows-static=fail
-qt5-wayland:x64-windows-static-md=fail
# Missing prerequisites for CI success
qt5-webengine:x64-linux=fail
qt5-webengine:x64-osx=fail
@@ -1475,8 +1474,6 @@ soci:arm-uwp=fail
soci:x64-uwp=fail
sockpp:arm-uwp=fail
sockpp:x64-uwp=fail
-soem:x64-uwp=fail
-soem:arm-uwp=fail
soil2:arm-uwp=fail
soil2:x64-uwp=fail
soqt:arm64-windows=fail
@@ -1541,13 +1538,6 @@ teemo:arm64-windows=fail
teemo:x64-osx=fail
telnetpp:arm-uwp=fail
telnetpp:x64-uwp=fail
-tfhe:x86-windows=fail
-tfhe:x64-windows=fail
-tfhe:x64-windows-static=fail
-tfhe:x64-windows-static-md=fail
-tfhe:x64-uwp=fail
-tfhe:arm64-windows=fail
-tfhe:arm-uwp=fail
theia:arm64-windows = skip
theia:arm-uwp = skip
theia:x64-uwp = skip