Skip to content

Update tools #389

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.

Sign up for GitHub

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

Merged
donny-dont merged 1 commit into from
Nov 26, 2024
Merged

Update tools #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion buildbot-worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; `
Expand Down
2 changes: 1 addition & 1 deletion msbuild-2022/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion scm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 5 additions & 3 deletions tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;

Expand All @@ -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
Expand Down