From: Simon McVittie <smcv@collabora.com>
Date: Fri, 12 May 2023 14:24:17 +0000 (+0100)
Subject: CI: Update Windows runners
X-Git-Tag: dbus-1.15.6~15^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a6e9f5beb51b34fb8ea032189a1950d449a276d;p=thirdparty%2Fdbus.git

CI: Update Windows runners

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ccffb2c5e..aec249ed8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ variables:
   # If you are hacking on them or need a them to rebuild, its enough
   # to change any part of the string of the image you want.
   ###
-  WINDOWS_TAG: "2022-02-06.2"
+  WINDOWS_TAG: "2023-05-12.0"
 
   UPSTREAM_BRANCH: 'master'
   UPSTREAM_REPO: 'dbus/dbus'
@@ -119,7 +119,7 @@ windows amd64 image:
   tags:
     - windows
     - shell
-    - "1809"
+    - "2022"
   script:
     # We need to pass an array and to resolve the env vars, so we can't use a variable:
     - $DOCKER_BUILD_ARGS = @("--build-arg", "DEFAULT_BRANCH=$UPSTREAM_BRANCH")
@@ -340,7 +340,7 @@ ubuntu jammy autotools:
   tags:
     - 'docker'
     - 'windows'
-    - '1809'
+    - '2022'
   needs:
     - "windows amd64 image"
   timeout: '2h'
diff --git a/tools/docker/windows/Dockerfile b/tools/docker/windows/Dockerfile
index bff4c501c..13c0feea1 100644
--- a/tools/docker/windows/Dockerfile
+++ b/tools/docker/windows/Dockerfile
@@ -1,6 +1,6 @@
 # escape=`
 
-FROM 'mcr.microsoft.com/windows/servercore:ltsc2019'
+FROM 'mcr.microsoft.com/windows/servercore:ltsc2022'
 
 # Make sure any failure in PowerShell scripts is fatal
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]