Add Windows 2022 based images (#244)

donny-dont · web-flow · commit a23ec53dba72 · 2022-04-14T09:53:13.000-07:00
These work with Windows Server 2022. To build local Windows 10 21H2 is required.
diff --git a/.drone.jsonnet b/.drone.jsonnet
@@ -5,11 +5,11 @@ local images = [
   'scripts',
   'scm',
   'tools',
-  'msbuild',
   'msbuild-2017',
+  'msbuild-2019',
   'msbuild-2022',
+  'buildbot-worker',
   'buildbot',
-  'ews',
 ];
 
 local tags = [
@@ -18,6 +18,7 @@ local tags = [
   '1909',
   '2004',
   '20H2',
+  '2022',
   'windows-1809',
   'windows-1903',
   'windows-1909',
diff --git a/Build-All.ps1 b/Build-All.ps1
@@ -1,6 +1,6 @@
 param(
   [Parameter(Mandatory)]
-  [ValidateSet('1809','1903','1909','2004','20H2','windows-1809','windows-1903','windows-1909','windows-2004','windows-20H2','aws', 'windows-aws')]
+  [ValidateSet('1809','1903','1909','2004','20H2','2022','windows-1809','windows-1903','windows-1909','windows-2004','windows-20H2','aws', 'windows-aws')]
   [string]$tag
 )
 
diff --git a/Publish-All.ps1 b/Publish-All.ps1
@@ -1,6 +1,6 @@
 param(
   [Parameter(Mandatory)]
-  [ValidateSet('1809','1903','1909','2004','20H2','windows-1809','windows-1903','windows-1909','windows-2004','windows-20H2','aws', 'windows-aws')]
+  [ValidateSet('1809','1903','1909','2004','20H2','2022','windows-1809','windows-1903','windows-1909','windows-2004','windows-20H2','aws', 'windows-aws')]
   [string]$tag
 )
 
diff --git a/base/Dockerfile.2022 b/base/Dockerfile.2022
@@ -0,0 +1 @@
+FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022
diff --git a/base/manifest.tmpl b/base/manifest.tmpl
@@ -36,3 +36,9 @@ manifests:
       architecture: amd64
       os: windows
       version: 20H2
+  -
+    image: webkitdev/base:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}2022
+    platform:
+      architecture: amd64
+      os: windows
+      version: 2022
diff --git a/buildbot-worker/manifest.tmpl b/buildbot-worker/manifest.tmpl
@@ -36,3 +36,9 @@ manifests:
       architecture: amd64
       os: windows
       version: 20H2
+  -
+    image: webkitdev/buildbot-worker{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}2022
+    platform:
+      architecture: amd64
+      os: windows
+      version: 2022
diff --git a/buildbot/manifest.tmpl b/buildbot/manifest.tmpl
@@ -36,3 +36,9 @@ manifests:
       architecture: amd64
       os: windows
       version: 20H2
+  -
+    image: webkitdev/buildbot:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}2022
+    platform:
+      architecture: amd64
+      os: windows
+      version: 2022
diff --git a/ews-legacy/manifest.tmpl b/ews-legacy/manifest.tmpl
@@ -36,3 +36,9 @@ manifests:
       architecture: amd64
       os: windows
       version: 20H2
+  -
+    image: webkitdev/ews-legacy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}2022
+    platform:
+      architecture: amd64
+      os: windows
+      version: 2022
diff --git a/msbuild-2017/manifest.tmpl b/msbuild-2017/manifest.tmpl
@@ -36,3 +36,9 @@ manifests:
       architecture: amd64
       os: windows
       version: 20H2
+  -
+    image: webkitdev/msbuild-2017:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}2022
+    platform:
+      architecture: amd64
+      os: windows
+      version: 2022
diff --git a/msbuild-2019/manifest.tmpl b/msbuild-2019/manifest.tmpl
@@ -31,8 +31,14 @@ manifests:
       os: windows
       version: 2004
   -
-    image: webkitdev/ews-legacy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}20H2
+    image: webkitdev/msbuild-2019:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}20H2
     platform:
       architecture: amd64
       os: windows
       version: 20H2
+  -
+    image: webkitdev/msbuild-2019:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}2022
+    platform:
+      architecture: amd64
+      os: windows
+      version: 2022
diff --git a/msbuild-2022/manifest.tmpl b/msbuild-2022/manifest.tmpl
@@ -36,3 +36,9 @@ manifests:
       architecture: amd64
       os: windows
       version: 20H2
+  -
+    image: webkitdev/msbuild-2022:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}2022
+    platform:
+      architecture: amd64
+      os: windows
+      version: 2022
diff --git a/scm/manifest.tmpl b/scm/manifest.tmpl
@@ -36,3 +36,9 @@ manifests:
       architecture: amd64
       os: windows
       version: 20H2
+  -
+    image: webkitdev/scm:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}2022
+    platform:
+      architecture: amd64
+      os: windows
+      version: 2022
diff --git a/scripts/manifest.tmpl b/scripts/manifest.tmpl
@@ -36,3 +36,9 @@ manifests:
       architecture: amd64
       os: windows
       version: 20H2
+  -
+    image: webkitdev/scripts:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}2022
+    platform:
+      architecture: amd64
+      os: windows
+      version: 20H2
diff --git a/tools/manifest.tmpl b/tools/manifest.tmpl
@@ -36,3 +36,9 @@ manifests:
       architecture: amd64
       os: windows
       version: 20H2
+  -
+    image: webkitdev/tools:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}2022
+    platform:
+      architecture: amd64
+      os: windows
+      version: 2022

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`param(`
`2`	`2`	`[Parameter(Mandatory)]`
`3`		`- [ValidateSet('1809','1903','1909','2004','20H2','windows-1809','windows-1903','windows-1909','windows-2004','windows-20H2','aws', 'windows-aws')]`
	`3`	`+ [ValidateSet('1809','1903','1909','2004','20H2','2022','windows-1809','windows-1903','windows-1909','windows-2004','windows-20H2','aws', 'windows-aws')]`
`4`	`4`	`[string]$tag`
`5`	`5`	`)`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022`