Skip to content

Commit 78af79d

Browse files
committed
Update tools
perl -> 5.42.0.1 pip -> 25.2 pywin32 -> 311 ruby -> 3.4.6.1 cmake -> 3.31.9 ninja -> 1.13.1 nuget -> 6.14.0 llvm -> 21.1.0 buildbot-worker -> 4.3.0
1 parent f37282d commit 78af79d

File tree

4 files changed

+13
-16
lines changed

4 files changed

+13
-16
lines changed

buildbot-worker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN Install-FromArchive -Name 'vcpkg' -url ('https://github.com/microsoft/vcpkg/
2828
# Install buildbot
2929
#--------------------------------------------------------------------
3030

31-
ENV BUILDBOT_VERSION 4.2.1
31+
ENV BUILDBOT_VERSION 4.3.0
3232

3333
RUN Write-Host 'Installing buildbot ...'; `
3434
pip3 install -q ('buildbot-worker=={0}' -f $env:BUILDBOT_VERSION); `

msbuild-2022/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN Install-VSBuildTools2022 -InstallationPath C:\MSVS -Workloads `
2020
# Install LLVM for Clang tooling support
2121
#--------------------------------------------------------------------
2222

23-
ENV LLVM_VERSION 20.1.4
23+
ENV LLVM_VERSION 21.1.0
2424

2525
RUN Install-LLVM -Version $env:LLVM_VERSION -InstallationPath C:\LLVM;
2626

scripts/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN $scriptArgs = @{ `
6262
# Install Chocolatey
6363
#--------------------------------------------------------------------
6464

65-
RUN Invoke-WebFileRequest -Url https://community.chocolatey.org/install.ps1 -DestinationPath C:install.ps1; `
66-
C:\install.ps1; `
67-
Remove-Item C:\install.ps1; `
65+
RUN Invoke-WebFileRequest -Url https://community.chocolatey.org/install.ps1 -DestinationPath C:/install.ps1; `
66+
C:/install.ps1; `
67+
Remove-Item C:/install.ps1; `
6868
choco --version;

tools/Dockerfile

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,20 @@ RUN Register-SystemPath -Path C:\Tools\gperf\bin; `
5454

5555
#--------------------------------------------------------------------
5656
# Install Strawberry Perl x64
57-
#
58-
# ActivePerl is recommended in the WebKit documentation but won't
59-
# install into a docker container. Also its not free so can't
60-
# technically use it for a build-bot.
6157
#--------------------------------------------------------------------
6258

63-
ENV PERL_VERSION 5.32.1.1
59+
ENV PERL_VERSION 5.42.0.1
6460

6561
RUN Install-Perl -Version $env:PERL_VERSION -InstallationPath C:\tools\perl;
6662

6763
#--------------------------------------------------------------------
6864
# Install Python 3
6965
#--------------------------------------------------------------------
7066

67+
# Python 3.12.x will get some security releases but no additional installers
68+
# Verify if 3.13.x or 3.14.x can be used with the bots before updating further
7169
ENV PYTHON3_VERSION 3.12.10
72-
ENV PYTHON3_PIP_VERSION 25.1.1
70+
ENV PYTHON3_PIP_VERSION 25.2
7371

7472
RUN Install-Python `
7573
-Version $env:PYTHON3_VERSION `
@@ -81,7 +79,7 @@ RUN copy-item C:\tools\python3\python.exe C:\tools\python3\python3.exe
8179
# Install pywin32 for Python 3
8280
#--------------------------------------------------------------------
8381

84-
ENV PYWIN32_VERSION 310
82+
ENV PYWIN32_VERSION 311
8583

8684
RUN Write-Host Write-Host 'Installing pywin32 ...'; `
8785
pip3 install -q ('pywin32=={0}' -f $env:PYWIN32_VERSION); `
@@ -91,7 +89,6 @@ RUN Write-Host Write-Host 'Installing pywin32 ...'; `
9189
# Install Ruby
9290
#--------------------------------------------------------------------
9391

94-
# Locked version due to later versions not installing in container
9592
ENV RUBY_VERSION 3.1.3.1
9693

9794
RUN Install-Ruby -Version $env:RUBY_VERSION -InstallationPath C:\tools\ruby;
@@ -108,23 +105,23 @@ RUN gem install webrick -v $env:WEBRICK_VERSION
108105
# Install CMake
109106
#--------------------------------------------------------------------
110107

111-
ENV CMAKE_VERSION 3.31.7
108+
ENV CMAKE_VERSION 3.31.9
112109

113110
RUN Install-CMake -Version $env:CMAKE_VERSION -InstallationPath C:\tools\cmake;
114111

115112
#--------------------------------------------------------------------
116113
# Install Ninja build system
117114
#--------------------------------------------------------------------
118115

119-
ENV NINJA_VERSION 1.12.1
116+
ENV NINJA_VERSION 1.13.1
120117

121118
RUN Install-Ninja -Version $env:NINJA_VERSION -InstallationPath C:\tools\ninja;
122119

123120
#--------------------------------------------------------------------
124121
# Install NuGet CLI
125122
#--------------------------------------------------------------------
126123

127-
ENV NUGET_VERSION 6.13.2
124+
ENV NUGET_VERSION 6.14.0
128125

129126
RUN Install-NuGet -Version $env:NUGET_VERSION -InstallationPath C:\tools\nuget;
130127

0 commit comments

Comments
 (0)