From c794b4464378a36a33ebdfd587860f1641465c2d Mon Sep 17 00:00:00 2001 From: Don Olmstead Date: Mon, 25 Nov 2024 17:32:39 -0800 Subject: [PATCH] Update tools Adding back in registry setting for xampp. git -> 2.47.1.1 cmake -> 3.31.1 nuget -> 6.12.1 llvm -> 19.1.4 vcpkg -> 2024.11.16 --- buildbot-worker/Dockerfile | 2 +- msbuild-2022/Dockerfile | 2 +- scm/Dockerfile | 2 +- tools/Dockerfile | 8 +++++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/buildbot-worker/Dockerfile b/buildbot-worker/Dockerfile index 3ba9f5b..5de2f5b 100644 --- a/buildbot-worker/Dockerfile +++ b/buildbot-worker/Dockerfile @@ -12,7 +12,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # workload. At this time the workload isn't present for Build Tools #-------------------------------------------------------------------- -ENV VCPKG_VERSION 2024.10.21 +ENV VCPKG_VERSION 2024.11.16 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; ` diff --git a/msbuild-2022/Dockerfile b/msbuild-2022/Dockerfile index 8ee89af..be87245 100644 --- a/msbuild-2022/Dockerfile +++ b/msbuild-2022/Dockerfile @@ -25,7 +25,7 @@ RUN Install-VSBuildTools2022 -InstallationPath C:\MSVS -Workloads ` # Install LLVM for Clang tooling support #-------------------------------------------------------------------- -ENV LLVM_VERSION 19.1.3 +ENV LLVM_VERSION 19.1.4 RUN Register-SystemPath -Path C:\LLVM\bin; ` Install-LLVM -Version $env:LLVM_VERSION -InstallationPath C:\LLVM; diff --git a/scm/Dockerfile b/scm/Dockerfile index f5c27fc..2562d1b 100644 --- a/scm/Dockerfile +++ b/scm/Dockerfile @@ -9,7 +9,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # Install Git for Windows x64 CLI #-------------------------------------------------------------------- -ENV GIT_VERSION 2.47.0.2 +ENV GIT_VERSION 2.47.1.1 RUN Install-Git -Version $env:GIT_VERSION; diff --git a/tools/Dockerfile b/tools/Dockerfile index 5a5a0e5..e142dc0 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -108,7 +108,7 @@ RUN gem install webrick -v $env:WEBRICK_VERSION # Install CMake #-------------------------------------------------------------------- -ENV CMAKE_VERSION 3.31.0 +ENV CMAKE_VERSION 3.31.1 RUN Install-CMake -Version $env:CMAKE_VERSION -InstallationPath C:\tools\cmake; @@ -124,7 +124,7 @@ RUN Install-Ninja -Version $env:NINJA_VERSION -InstallationPath C:\tools\ninja; # Install NuGet CLI #-------------------------------------------------------------------- -ENV NUGET_VERSION 6.11.1 +ENV NUGET_VERSION 6.12.1 RUN Install-NuGet -Version $env:NUGET_VERSION -InstallationPath C:\tools\nuget; @@ -135,7 +135,9 @@ RUN Install-NuGet -Version $env:NUGET_VERSION -InstallationPath C:\tools\nuget; # Locked version due to later versions not installing in container ENV XAMPP_VERSION 8.1.6 -RUN choco install xampp-81 --confirm --version=$env:XAMPP_VERSION; +RUN choco install xampp-81 --confirm --version=$env:XAMPP_VERSION; ` + Update-XamppPerlLocation -perlPath C:\tools\perl; ` + Update-XamppPythonLocation -pythonPath C:\tools\python3; #-------------------------------------------------------------------- # Install Fonts