From 33d302d91240a67afc9de5e513c113e194daba88 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Wed, 27 Jul 2022 17:04:47 +0300
Subject: [PATCH] ci: switch the windows CI to server 2022

---
 .gitlab-ci.yml                       | 14 +++++++-------
 .gitlab-ci/win_containers.yml        | 12 ++++++------
 .gitlab-ci/windows/Dockerfile.vs2022 |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ba1e9d49..edc8fc152 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -175,10 +175,10 @@ arch:rolling:container_prep:
   inherit:
     default: false
   variables:
-    MONADO_WIN_BASE_TAG: "20220518.0"
-    MONADO_WIN_MAIN_TAG: "20220520.0"
-    MONADO_BASE_IMAGE_PATH: "win2019/vs2022_base"
-    MONADO_MAIN_IMAGE_PATH: "win2019/vs2022"
+    MONADO_WIN_BASE_TAG: "20220727.0"
+    MONADO_WIN_MAIN_TAG: "20220727.0"
+    MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base"
+    MONADO_MAIN_IMAGE_PATH: "win2022/vs2022"
 
 .monado.variables.windows:vs2022:
   inherit:
@@ -197,7 +197,7 @@ arch:rolling:container_prep:
     default: false
   tags:
     - windows
-    - "1909"
+    - "2022"
     - shell
   variables:
     GIT_STRATEGY: fetch
@@ -238,7 +238,7 @@ win:container_prep:
 .monado.image.windows:
   tags:
     - windows
-    - "1909"
+    - "2022"
     - docker
   extends:
     - .monado.variables.windows:vs2022
@@ -621,4 +621,4 @@ pages:
     - mv repo public/apt
   artifacts:
     paths:
-      - public
\ No newline at end of file
+      - public
diff --git a/.gitlab-ci/win_containers.yml b/.gitlab-ci/win_containers.yml
index a63d40190..493aa780f 100644
--- a/.gitlab-ci/win_containers.yml
+++ b/.gitlab-ci/win_containers.yml
@@ -9,10 +9,10 @@
   inherit:
     default: false
   variables:
-    MONADO_WIN_BASE_TAG: "20220518.0"
-    MONADO_WIN_MAIN_TAG: "20220520.0"
-    MONADO_BASE_IMAGE_PATH: "win2019/vs2022_base"
-    MONADO_MAIN_IMAGE_PATH: "win2019/vs2022"
+    MONADO_WIN_BASE_TAG: "20220727.0"
+    MONADO_WIN_MAIN_TAG: "20220727.0"
+    MONADO_BASE_IMAGE_PATH: "win2022/vs2022_base"
+    MONADO_MAIN_IMAGE_PATH: "win2022/vs2022"
 
 .monado.variables.windows:vs2022:
   inherit:
@@ -31,7 +31,7 @@
     default: false
   tags:
     - windows
-    - "1909"
+    - "2022"
     - shell
   variables:
     GIT_STRATEGY: fetch
@@ -72,7 +72,7 @@ win:container_prep:
 .monado.image.windows:
   tags:
     - windows
-    - "1909"
+    - "2022"
     - docker
   extends:
     - .monado.variables.windows:vs2022
diff --git a/.gitlab-ci/windows/Dockerfile.vs2022 b/.gitlab-ci/windows/Dockerfile.vs2022
index 77252ff46..8e79aa6be 100644
--- a/.gitlab-ci/windows/Dockerfile.vs2022
+++ b/.gitlab-ci/windows/Dockerfile.vs2022
@@ -6,7 +6,7 @@
 # escape=`
 
 # FROM mcr.microsoft.com/windows:2004
-FROM mcr.microsoft.com/windows/servercore:ltsc2019
+FROM mcr.microsoft.com/windows/server:ltsc2022
 
 # Make sure any failure in PowerShell scripts is fatal
 SHELL ["powershell", "-ExecutionPolicy", "RemoteSigned", "-Command", "$ErrorActionPreference = 'Stop';"]