Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update VMs for June Patch Tuesday #25260

Merged
merged 6 commits into from
Jun 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# SPDX-License-Identifier: MIT
#
variables:
windows-pool: 'PrWin-2022-05-19'
linux-pool: 'PrLin-2022-05-19'
windows-pool: 'PrWin-2022-06-15'
linux-pool: 'PrLin-2022-06-15'
osx-pool: 'PrOsx-2022-02-04'

parameters:
Expand Down
3 changes: 3 additions & 0 deletions scripts/azure-pipelines/linux/provision-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ APT_PACKAGES="$APT_PACKAGES guile-2.2-dev"
# Additionally required by gtk
APT_PACKAGES="$APT_PACKAGES libxdamage-dev"

# Additionally required by gtk3 and at-spi2-atk
APT_PACKAGES="$APT_PACKAGES libdbus-1-dev"

# Additionally required/installed by Azure DevOps Scale Set Agents
APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66"

Expand Down
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/windows/deploy-pwsh.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@

# REPLACE WITH UTILITY-PREFIX.ps1

$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x64.msi'
$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x64.msi'
InstallMSI -Url $PwshUrl -Name 'PowerShell Core'
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/windows/deploy-visual-studio.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $Workloads = @(
'Microsoft.VisualStudio.Component.VC.ATL.ARM64',
'Microsoft.VisualStudio.Component.VC.MFC.ARM',
'Microsoft.VisualStudio.Component.VC.MFC.ARM64',
'Microsoft.VisualStudio.Component.Windows10SDK',
"Microsoft.VisualStudio.Component.Windows11SDK.22621",
'Microsoft.Net.Component.4.8.SDK',
'Microsoft.Net.Component.4.7.2.TargetingPack',
'Microsoft.Component.NetFX.Native',
Expand Down
3 changes: 0 additions & 3 deletions scripts/azure-pipelines/windows/deploy-windows-sdks.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,5 @@ Function InstallWindowsDK {
}
}

# Windows 10 SDK, version 2004 (10.0.19041.0)
InstallWindowsDK 'https://go.microsoft.com/fwlink/?linkid=2120843'

# Windows 10 WDK, version 2004
InstallWindowsDK 'https://go.microsoft.com/fwlink/?linkid=2128854'
30 changes: 12 additions & 18 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,13 @@ foonathan-memory:arm64-windows=fail
foonathan-memory:arm-uwp=fail
foonathan-memory:x64-uwp=fail
forge:x86-windows=fail
freeglut:arm64-windows=fail
freeglut:arm-uwp=fail
freeglut:x64-uwp=fail
freeglut:x64-osx=fail
# Needs /bigobj
freeopcua:arm64-windows=fail
ftgl:x64-uwp=fail
ftgl:arm-uwp=fail
# https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207
functions-framework-cpp:x64-uwp=fail

Expand Down Expand Up @@ -302,10 +302,7 @@ gherkin-c:x64-windows = skip
gherkin-c:x64-windows-static = skip
gherkin-c:x64-windows-static-md = skip
gherkin-c:x86-windows = skip
gl3w:arm64-windows=fail
gl3w:arm-uwp=fail
glew:arm64-windows=fail
glew:arm-uwp=fail
glfw3:arm-uwp=fail
glfw3:x64-uwp=fail
glib:x64-uwp=fail
Expand Down Expand Up @@ -397,8 +394,6 @@ kfr:arm-uwp=fail
kfr:x64-linux=fail
lastools:arm-uwp=fail
lastools:x64-uwp=fail
laszip:arm-uwp=fail
laszip:x64-uwp=fail
leptonica:x64-uwp=fail
leptonica:arm-uwp=fail
leveldb:arm-uwp=fail
Expand Down Expand Up @@ -596,6 +591,7 @@ marble:arm-uwp=fail
marble:x64-linux=fail
marble:x64-osx=fail
marble:x86-windows=fail
mathgl:arm-uwp=fail
mathgl:x64-osx=fail
mathgl:x64-uwp=fail
mecab:arm64-windows = skip
Expand Down Expand Up @@ -632,6 +628,12 @@ microsoft-signalr:x64-windows-static-md=skip
microsoft-signalr:x86-windows=skip
# https://github.com/mlpack/mlpack/pull/2945
mlpack:x64-uwp=fail
ms-quic:arm-uwp=fail
ms-quic:arm64-windows=fail
ms-quic:x64-uwp=fail
ms-quic:x64-windows-static-md=fail
ms-quic:x64-windows=fail
ms-quic:x86-windows=fail
# mmx installs many problematic headers, such as `json.h` and `sched.h`
mmx:x64-windows=skip
mmx:x64-windows-static=skip
Expand Down Expand Up @@ -771,6 +773,7 @@ opencensus-cpp:x86-windows=fail
opencensus-cpp:x64-uwp=fail
opencl:arm-uwp=fail
opencl:x64-uwp=fail
opencsg:arm-uwp=fail
opencsg:x64-uwp=fail
opencv2:arm64-windows = skip
opencv2:arm-uwp = skip
Expand All @@ -795,8 +798,7 @@ opendnp3:arm-uwp=fail
openexr:arm64-windows=fail
openexr:arm-uwp=fail
openexr:x64-uwp=fail
opengl:arm64-windows=fail
opengl:arm-uwp=fail
opengl:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599
openmama:x64-windows-static-md=fail
openmesh:arm64-windows=fail
openmesh:arm-uwp=fail
Expand Down Expand Up @@ -973,12 +975,6 @@ rtlsdr:arm-uwp=fail
rtlsdr:x64-linux=fail
rtlsdr:x64-osx=fail

# rttr's build fails in CI with
# D:\buildtrees\rttr\src\v0.9.6-9229bdee1f.clean\src\rttr\detail\library\library_win.cpp(236): error C3861: 'LoadLibraryW': identifier not found
# .... but it succeeds when I try building it locally.
rttr:arm-uwp=fail
rttr:x64-uwp=fail

# ryu does not support VS2022 yet
ryu:x64-windows=fail
ryu:x64-windows-static=fail
Expand Down Expand Up @@ -1007,13 +1003,9 @@ sdl2-mixer:arm-uwp=fail
sdl2-mixer:x64-uwp=fail
sdl2-net:arm-uwp=fail
sdl2-net:x64-uwp=fail
# https://github.com/microsoft/vcpkg/issues/10918
seal:arm-uwp=fail
seal:x64-uwp=fail
septag-sx:arm64-windows=fail
septag-sx:arm-uwp=fail
septag-sx:x64-uwp=fail
sfml:arm64-windows=fail
shiva:x64-windows-static=fail
shiva:x64-windows-static-md=fail
shiva-sfml:x64-linux=fail
Expand Down Expand Up @@ -1172,8 +1164,10 @@ winpcap:x64-windows-static-md=skip
winpcap:x86-windows = skip
winreg:x64-linux=fail
winreg:x64-osx=fail
winsock2:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599
wpilib:arm64-windows=fail
wpilib:x64-osx=fail
wincrypt:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599
wxchartdir:x64-osx=fail
wxwidgets:x64-linux=fail
x265:arm64-windows=fail
Expand Down
8 changes: 4 additions & 4 deletions scripts/vcpkgTools.xml
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,11 @@
<archiveName>ninja-freebsd-1.8.2.zip</archiveName>
</tool>
<tool name="powershell-core" os="windows">
<version>7.2.3</version>
<version>7.2.4</version>
<exeRelativePath>pwsh.exe</exeRelativePath>
<url>https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x86.zip</url>
<sha512>4b275fd1dc6430e0d7b77d4c34ec54ad47502602592ebc1ec99c88610ec24d3adca27a41896dc4767ac820ad7e000f9c2b1d678b05e9dd76086ff52a11976f80</sha512>
<archiveName>PowerShell-7.2.3-win-x86.zip</archiveName>
<url>https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x86.zip</url>
<sha512>4f337c66e03124cfc1e96a56a943ccd24f9a22f588fa461bea9e14733acf06acddd873860b10843c92251257a64fbfac967ae77c084960aaf6b14522435b7769</sha512>
<archiveName>PowerShell-7.2.4-win-x86.zip</archiveName>
</tool>
<tool name="node" os="windows">
<version>16.12.0</version>
Expand Down