Skip to content

Commit c111328

Browse files
authored
Add VS 2022 install (#210)
1 parent 39a5f81 commit c111328

File tree

5 files changed

+78
-1
lines changed

5 files changed

+78
-1
lines changed

Build-All.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ Build-WebKitDockerImage -Image scm -Tag $tag;
4040
Build-WebKitDockerImage -Image tools -Tag $tag;
4141
Build-WebKitDockerImage -Image msbuild -Tag $tag;
4242
Build-WebKitDockerImage -Image msbuild-2017 -Tag $tag;
43+
Build-WebKitDockerImage -Image msbuild-2022 -Tag $tag;
4344
Build-WebKitDockerImage -Image buildbot-worker -Tag $tag;
4445
Build-WebKitDockerImage -Image buildbot -Tag $tag;

Publish-All.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@ Publish-WebKitDockerImage -Image scm -Tag $tag;
3030
Publish-WebKitDockerImage -Image tools -Tag $tag;
3131
Publish-WebKitDockerImage -Image msbuild -Tag $tag;
3232
Publish-WebKitDockerImage -Image msbuild-2017 -Tag $tag;
33+
Publish-WebKitDockerImage -Image msbuild-2022 -Tag $tag;
3334
Publish-WebKitDockerImage -Image buildbot-worker -Tag $tag;
3435
Publish-WebKitDockerImage -Image buildbot -Tag $tag;

msbuild-2022/Dockerfile

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# escape=`
2+
3+
ARG IMAGE_TAG
4+
FROM webkitdev/tools:$IMAGE_TAG
5+
6+
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
7+
8+
#--------------------------------------------------------------------
9+
# Install MS Build Tools 2022
10+
#--------------------------------------------------------------------
11+
12+
RUN Install-VSBuildTools2022 -InstallationPath C:\MSVS -Workloads `
13+
Microsoft.VisualStudio.Component.Roslyn.Compiler, `
14+
Microsoft.Component.MSBuild, `
15+
Microsoft.VisualStudio.Component.CoreBuildTools, `
16+
Microsoft.VisualStudio.Workload.MSBuildTools, `
17+
Microsoft.VisualStudio.Component.Windows10SDK, `
18+
Microsoft.VisualStudio.Component.VC.CoreBuildTools, `
19+
Microsoft.VisualStudio.Component.VC.Tools.x86.x64, `
20+
Microsoft.VisualStudio.Component.VC.Redist.14.Latest, `
21+
Microsoft.VisualStudio.Component.Windows10SDK.17763, `
22+
Microsoft.VisualStudio.Workload.VCTools
23+
24+
#--------------------------------------------------------------------
25+
# Install LLVM for Clang tooling support
26+
#--------------------------------------------------------------------
27+
28+
ENV LLVM_VERSION 13.0.0
29+
30+
RUN Register-SystemPath -Path C:\LLVM\bin; `
31+
Install-LLVM -Version $env:LLVM_VERSION -InstallationPath C:\LLVM;
32+
33+
#--------------------------------------------------------------------
34+
# Install Debugging Tools for Windows
35+
#--------------------------------------------------------------------
36+
37+
RUN Install-Windows10SDK -Features OptionId.WindowsDesktopDebuggers;

msbuild-2022/manifest.tmpl

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
image: webkitdev/msbuild-2022:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
2+
{{#if build.tags}}
3+
tags:
4+
{{#each build.tags}}
5+
- {{this}}
6+
{{/each}}
7+
{{/if}}
8+
manifests:
9+
-
10+
image: webkitdev/msbuild-2022:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1809
11+
platform:
12+
architecture: amd64
13+
os: windows
14+
version: 1809
15+
-
16+
image: webkitdev/msbuild-2022:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1903
17+
platform:
18+
architecture: amd64
19+
os: windows
20+
version: 1903
21+
-
22+
image: webkitdev/msbuild-2022:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}1909
23+
platform:
24+
architecture: amd64
25+
os: windows
26+
version: 1909
27+
-
28+
image: webkitdev/msbuild-2022:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}2004
29+
platform:
30+
architecture: amd64
31+
os: windows
32+
version: 2004
33+
-
34+
image: webkitdev/msbuild-2022:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}20H2
35+
platform:
36+
architecture: amd64
37+
os: windows
38+
version: 20H2

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.3.0
46+
ENV WEBKIT_DEV_VERSION 0.4.0
4747

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

0 commit comments

Comments
 (0)