From d8ce549d0c36a82b734125d5f481828eb6dbaa88 Mon Sep 17 00:00:00 2001 From: Ian Grunert Date: Wed, 8 Jul 2026 10:14:52 -0400 Subject: [PATCH] feat: install Swift toolchain in msbuild-2022 image Installs Swift 6.3.3 alongside LLVM in the msbuild-2022 image using the new Install-Swift helper, so the toolchain sits with the MSVC toolchain and Windows SDK it needs to compile. Bumps the WebKitDev module to 0.7.0 and tracks the Swift version in UPDATING.md. Swift is becoming a required component for building WebKit. Co-Authored-By: Claude Opus 4.8 (1M context) --- UPDATING.md | 1 + msbuild-2022/Dockerfile | 11 +++++++++++ scripts/Dockerfile | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/UPDATING.md b/UPDATING.md index 17d2bd3c..214f38d8 100644 --- a/UPDATING.md +++ b/UPDATING.md @@ -25,6 +25,7 @@ site for updates using the :point_down: table. | cmake | https://cmake.org/download | | ninja | https://ninja-build.org | | nuget | https://www.nuget.org/downloads | +| swift | https://www.swift.org/install/windows | | llvm | https://github.com/llvm/llvm-project/releases | Every software in the Dockerfile has a corresponding `_VERSION` environment diff --git a/msbuild-2022/Dockerfile b/msbuild-2022/Dockerfile index 1b0d1485..6b6638e3 100644 --- a/msbuild-2022/Dockerfile +++ b/msbuild-2022/Dockerfile @@ -25,6 +25,17 @@ ENV LLVM_VERSION 21.1.8 RUN Install-LLVM -Version $env:LLVM_VERSION -InstallationPath C:\LLVM; +#-------------------------------------------------------------------- +# Install Swift toolchain +# +# Swift is becoming a required component for building WebKit. It relies +# on the MSVC toolchain and Windows SDK installed above. +#-------------------------------------------------------------------- + +ENV SWIFT_VERSION 6.3.3 + +RUN Install-Swift -Version $env:SWIFT_VERSION; + #-------------------------------------------------------------------- # Install Debugging Tools for Windows #-------------------------------------------------------------------- diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 7b34d7c2..1a48543d 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -43,7 +43,7 @@ RUN $scriptArgs = @{ ` # Install WebKitDev Module #-------------------------------------------------------------------- -ENV WEBKIT_DEV_VERSION 0.6.4 +ENV WEBKIT_DEV_VERSION 0.7.0 RUN $scriptArgs = @{ ` Name = 'WebKitDev'; `