Skip to content

Commit c2249f7

Browse files
authored
Use WebKitDev to v0.6.2 (#445)
Migrates from manual installers to chocolatey for package installation. Only git, ninja and nuget are not affected by this change.
1 parent 03ac2eb commit c2249f7

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

msbuild-2022/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ RUN Install-VSBuildTools2022 -InstallationPath C:\MSVS -Workloads `
2727

2828
ENV LLVM_VERSION 20.1.4
2929

30-
RUN Register-SystemPath -Path C:\LLVM\bin; `
31-
Install-LLVM -Version $env:LLVM_VERSION -InstallationPath C:\LLVM;
30+
RUN Install-LLVM -Version $env:LLVM_VERSION -InstallationPath C:\LLVM;
3231

3332
#--------------------------------------------------------------------
3433
# Install Debugging Tools for Windows

scripts/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN $scriptArgs = @{ `
4343
# Install WebKitDev Module
4444
#--------------------------------------------------------------------
4545

46-
ENV WEBKIT_DEV_VERSION 0.5.2
46+
ENV WEBKIT_DEV_VERSION 0.6.2
4747

4848
RUN $scriptArgs = @{ `
4949
Name = 'WebKitDev'; `

tools/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ RUN Write-Host Write-Host 'Installing pywin32 ...'; `
9292
#--------------------------------------------------------------------
9393

9494
# Locked version due to later versions not installing in container
95-
ENV RUBY_VERSION 3.1.3-1
95+
ENV RUBY_VERSION 3.1.3.1
9696

9797
RUN Install-Ruby -Version $env:RUBY_VERSION -InstallationPath C:\tools\ruby;
9898

@@ -135,7 +135,7 @@ RUN Install-NuGet -Version $env:NUGET_VERSION -InstallationPath C:\tools\nuget;
135135
# Locked version due to later versions not installing in container
136136
ENV XAMPP_VERSION 8.1.6
137137

138-
RUN choco install xampp-81 --confirm --version=$env:XAMPP_VERSION; `
138+
RUN Install-Xampp -Version $env:XAMPP_VERSION; `
139139
Update-XamppPerlLocation -perlPath C:\tools\perl; `
140140
Update-XamppPythonLocation -pythonPath C:\tools\python3;
141141

0 commit comments

Comments
 (0)