Skip to content
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
19 changes: 0 additions & 19 deletions buildbot-worker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,6 @@ FROM webkitdev/msbuild-2022:$IMAGE_TAG

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

#--------------------------------------------------------------------
# Install vcpkg
#
# Remove if Microsoft Visual Studio Build Tools adds in a vcpkg
# workload. At this time the workload isn't present for Build Tools
#--------------------------------------------------------------------

ENV VCPKG_VERSION 2025.04.09
ENV VCPKG_ROOT C:\vcpkg

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; `
& ('{0}/scripts/bootstrap.ps1' -f $env:VCPKG_ROOT) -disableMetrics; `
Remove-Item -Recurse -Force (Join-Path $env:VCPKG_ROOT docs); `
Remove-Item -Recurse -Force (Join-Path $env:VCPKG_ROOT ports); `
Remove-Item -Recurse -Force (Join-Path $env:VCPKG_ROOT toolsrc); `
Remove-Item -Recurse -Force (Join-Path $env:VCPKG_ROOT versions); `
Register-SystemPath $env:VCPKG_ROOT; `
vcpkg version;

#--------------------------------------------------------------------
# Install buildbot
#--------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions msbuild-2022/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN Install-VSBuildTools2022 -InstallationPath C:\MSVS -Workloads `
Microsoft.VisualStudio.Workload.MSBuildTools, `
Microsoft.VisualStudio.Workload.VCTools, `
Microsoft.VisualStudio.Component.VC.Tools.x86.x64,`
Microsoft.VisualStudio.Component.Vcpkg, `
Microsoft.VisualStudio.Component.Windows11SDK.26100, `
Microsoft.VisualStudio.Component.Windows10SDK.18362;

Expand Down