Skip to content

Commit 016da8f

Browse files
committed
Add vcpkg workload to build tools installer
Add `Microsoft.VisualStudio.Component.Vcpkg` to the list of workflows and remove the manual installation of `vcpkg`. Fixes #433.
1 parent f37282d commit 016da8f

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

buildbot-worker/Dockerfile

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,6 @@ FROM webkitdev/msbuild-2022:$IMAGE_TAG
55

66
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
77

8-
#--------------------------------------------------------------------
9-
# Install vcpkg
10-
#
11-
# Remove if Microsoft Visual Studio Build Tools adds in a vcpkg
12-
# workload. At this time the workload isn't present for Build Tools
13-
#--------------------------------------------------------------------
14-
15-
ENV VCPKG_VERSION 2025.04.09
16-
ENV VCPKG_ROOT C:\vcpkg
17-
18-
RUN Install-FromArchive -Name 'vcpkg' -url ('https://github.com/microsoft/vcpkg/archive/refs/tags/{0}.zip' -f $env:VCPKG_VERSION) -archiveRoot ('vcpkg-{0}' -f $env:VCPKG_VERSION) -installationPath $env:VCPKG_ROOT -NoVerify; `
19-
& ('{0}/scripts/bootstrap.ps1' -f $env:VCPKG_ROOT) -disableMetrics; `
20-
Remove-Item -Recurse -Force (Join-Path $env:VCPKG_ROOT docs); `
21-
Remove-Item -Recurse -Force (Join-Path $env:VCPKG_ROOT ports); `
22-
Remove-Item -Recurse -Force (Join-Path $env:VCPKG_ROOT toolsrc); `
23-
Remove-Item -Recurse -Force (Join-Path $env:VCPKG_ROOT versions); `
24-
Register-SystemPath $env:VCPKG_ROOT; `
25-
vcpkg version;
26-
278
#--------------------------------------------------------------------
289
# Install buildbot
2910
#--------------------------------------------------------------------

msbuild-2022/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ RUN Install-VSBuildTools2022 -InstallationPath C:\MSVS -Workloads `
1313
Microsoft.VisualStudio.Workload.MSBuildTools, `
1414
Microsoft.VisualStudio.Workload.VCTools, `
1515
Microsoft.VisualStudio.Component.VC.Tools.x86.x64,`
16+
Microsoft.VisualStudio.Component.Vcpkg, `
1617
Microsoft.VisualStudio.Component.Windows11SDK.26100, `
1718
Microsoft.VisualStudio.Component.Windows10SDK.18362;
1819

0 commit comments

Comments
 (0)