Update Windows CI Task Names: Server 2022 + VS 2022 Upgrade

From 9eceff42445a753182c80985a7d89b445d30383c Mon Sep 17 00:00:00 2001
From: Nazir Bilal Yavuz <byavuz81@gmail.com>
Date: Thu, 4 Sep 2025 14:47:04 +0300
Subject: [PATCH v2 1/2] Force using Windows CI image with both VS versions
 installed

This patch should not be committed, only for testing!
---
 .cirrus.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 3f75852e84e..87085266ec2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -74,7 +74,12 @@ default_openbsd_task_template: &openbsd_task_template
 default_windows_task_template: &windows_task_template
   env:
     PLATFORM: windows
-  <<: *cirrus_community_vm_template
+  compute_engine_instance:
+    image_project: pg-ci-images-dev
+    image: pg-ci-windows-ci-2025-09-08t07-40-48
+    platform: $PLATFORM
+    cpu: $CPUS
+    disk: $DISK_SIZE
 
 
 # macos workers provided by cirrus-ci
-- 
2.51.0

From 0864e225c62f48eae2201573d40cff026c6b470e Mon Sep 17 00:00:00 2001
From: Nazir Bilal Yavuz <byavuz81@gmail.com>
Date: Thu, 4 Sep 2025 17:20:18 +0300
Subject: [PATCH v2 2/2] ci: windows: Default to VS 2022, run VS 2019 task
 manually

Both VS 2019 and VS 2022 are available on the Windows image [1], but
since VS 2022 is the latest version, make it the default. The VS 2019
task is still available but must be triggered manually.

[1] https://github.com/anarazel/pg-vm-images/pull/116

Author: Nazir Bilal Yavuz <byavuz81@gmail.com>
Discussion: https://postgr.es/m/flat/CAN55FZ1OsaM+852BMQDJ+Kgfg+07knJ6dM3PjbGbtYaK4qwfqA@mail.gmail.com
---
 .cirrus.star      |  3 ++-
 .cirrus.tasks.yml | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.cirrus.star b/.cirrus.star
index e9bb672b959..cecd9bb026c 100644
--- a/.cirrus.star
+++ b/.cirrus.star
@@ -73,7 +73,7 @@ def compute_environment_vars():
     # REPO_CI_AUTOMATIC_TRIGGER_TASKS="task_name other_task" under "Repository
     # Settings" on Cirrus CI's website.
 
-    default_manual_trigger_tasks = ['mingw', 'netbsd', 'openbsd']
+    default_manual_trigger_tasks = ['mingw', 'netbsd', 'openbsd', 'vs2019']
 
     repo_ci_automatic_trigger_tasks = env.get('REPO_CI_AUTOMATIC_TRIGGER_TASKS', '')
     for task in default_manual_trigger_tasks:
@@ -103,6 +103,7 @@ def compute_environment_vars():
       'netbsd',
       'openbsd',
       'sanitycheck',
+      'vs2019',
       'windows',
     ]
     commit_message = env.get('CIRRUS_CHANGE_MESSAGE')
diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml
index eca9d62fc22..07e32b588ea 100644
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@ -752,7 +752,6 @@ WINDOWS_ENVIRONMENT_BASE: &WINDOWS_ENVIRONMENT_BASE
 
 
 task:
-  name: Windows - Server 2019, VS 2019 - Meson & ninja
   << : *WINDOWS_ENVIRONMENT_BASE
 
   env:
@@ -775,10 +774,21 @@ task:
       -Dplperl=enabled
       -Dplpython=enabled
 
+  matrix:
+    - name: Windows - Server 2022, VS 2019 - Meson & ninja
+      env:
+        # Use VS 2019
+        PATH: C:\VS_2019\VC\Auxiliary\Build;${PATH}
+      trigger_type: $CI_TRIGGER_TYPE_VS2019
+      only_if: $CI_VS2019_ENABLED
+
+    # VS 2022 is the default VS installation
+    - name: Windows - Server 2022, VS 2022 - Meson & ninja
+      only_if: $CI_WINDOWS_ENABLED
+
   <<: *windows_task_template
 
   depends_on: SanityCheck
-  only_if: $CI_WINDOWS_ENABLED
 
   setup_additional_packages_script: |
     REM choco install -y --no-progress ...
-- 
2.51.0

From f9532eeac988735b02a78847ff6ba5139de546a8 Mon Sep 17 00:00:00 2001
From: Nazir Bilal Yavuz <byavuz81@gmail.com>
Date: Thu, 4 Sep 2025 14:47:04 +0300
Subject: [PATCH v3 1/2] Force using Windows CI image with both VS versions
 installed

This patch should not be committed, only for testing!
---
 .cirrus.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 3f75852e84e..87085266ec2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -74,7 +74,12 @@ default_openbsd_task_template: &openbsd_task_template
 default_windows_task_template: &windows_task_template
   env:
     PLATFORM: windows
-  <<: *cirrus_community_vm_template
+  compute_engine_instance:
+    image_project: pg-ci-images-dev
+    image: pg-ci-windows-ci-2025-09-08t07-40-48
+    platform: $PLATFORM
+    cpu: $CPUS
+    disk: $DISK_SIZE
 
 
 # macos workers provided by cirrus-ci
-- 
2.51.0

From 77ba9eaf85ba2b3304d85caa86ee371541df2c72 Mon Sep 17 00:00:00 2001
From: Nazir Bilal Yavuz <byavuz81@gmail.com>
Date: Thu, 4 Sep 2025 17:20:18 +0300
Subject: [PATCH v3 2/2] ci: windows: Default to VS 2022, run VS 2019 task
 manually

Both VS 2019 and VS 2022 are available on the Windows image [1], but
since VS 2022 is the latest version, make it the default. The VS 2019
task is still available but must be triggered manually.

[1] https://github.com/anarazel/pg-vm-images/pull/116

Author: Nazir Bilal Yavuz <byavuz81@gmail.com>
Discussion: https://postgr.es/m/flat/CAN55FZ1OsaM+852BMQDJ+Kgfg+07knJ6dM3PjbGbtYaK4qwfqA@mail.gmail.com
---
 .cirrus.star        |  3 ++-
 .cirrus.tasks.yml   | 14 ++++++++++++--
 src/tools/ci/README |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.cirrus.star b/.cirrus.star
index e9bb672b959..cecd9bb026c 100644
--- a/.cirrus.star
+++ b/.cirrus.star
@@ -73,7 +73,7 @@ def compute_environment_vars():
     # REPO_CI_AUTOMATIC_TRIGGER_TASKS="task_name other_task" under "Repository
     # Settings" on Cirrus CI's website.
 
-    default_manual_trigger_tasks = ['mingw', 'netbsd', 'openbsd']
+    default_manual_trigger_tasks = ['mingw', 'netbsd', 'openbsd', 'vs2019']
 
     repo_ci_automatic_trigger_tasks = env.get('REPO_CI_AUTOMATIC_TRIGGER_TASKS', '')
     for task in default_manual_trigger_tasks:
@@ -103,6 +103,7 @@ def compute_environment_vars():
       'netbsd',
       'openbsd',
       'sanitycheck',
+      'vs2019',
       'windows',
     ]
     commit_message = env.get('CIRRUS_CHANGE_MESSAGE')
diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml
index eca9d62fc22..07e32b588ea 100644
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@ -752,7 +752,6 @@ WINDOWS_ENVIRONMENT_BASE: &WINDOWS_ENVIRONMENT_BASE
 
 
 task:
-  name: Windows - Server 2019, VS 2019 - Meson & ninja
   << : *WINDOWS_ENVIRONMENT_BASE
 
   env:
@@ -775,10 +774,21 @@ task:
       -Dplperl=enabled
       -Dplpython=enabled
 
+  matrix:
+    - name: Windows - Server 2022, VS 2019 - Meson & ninja
+      env:
+        # Use VS 2019
+        PATH: C:\VS_2019\VC\Auxiliary\Build;${PATH}
+      trigger_type: $CI_TRIGGER_TYPE_VS2019
+      only_if: $CI_VS2019_ENABLED
+
+    # VS 2022 is the default VS installation
+    - name: Windows - Server 2022, VS 2022 - Meson & ninja
+      only_if: $CI_WINDOWS_ENABLED
+
   <<: *windows_task_template
 
   depends_on: SanityCheck
-  only_if: $CI_WINDOWS_ENABLED
 
   setup_additional_packages_script: |
     REM choco install -y --no-progress ...
diff --git a/src/tools/ci/README b/src/tools/ci/README
index d183648a8d0..97426096f7a 100644
--- a/src/tools/ci/README
+++ b/src/tools/ci/README
@@ -61,7 +61,7 @@ Controlling CI via commit messages
 The behavior of CI can be controlled by special content in commit
 messages. Currently the following controls are available:
 
-- ci-os-only: {(freebsd|linux|macos|mingw|netbsd|openbsd|windows)}
+- ci-os-only: {(freebsd|linux|macos|mingw|netbsd|openbsd|vs2019|windows)}
 
   Only runs CI on operating systems specified. This can be useful when
   addressing portability issues affecting only a subset of platforms.
@@ -92,4 +92,4 @@ credits too quickly. This can be changed on the repository level, e.g. when
 custom compute resources are configured.
 
 The following repository level environment variables are recognized:
-- REPO_CI_AUTOMATIC_TRIGGER_TASKS - space-separated list of (mingw|netbsd|openbsd)
+- REPO_CI_AUTOMATIC_TRIGGER_TASKS - space-separated list of (mingw|netbsd|openbsd|vs2019)
-- 
2.51.0

From 05d9ae9ce164e7275620d03a1517912287cec1e1 Mon Sep 17 00:00:00 2001
From: Nazir Bilal Yavuz <byavuz81@gmail.com>
Date: Mon, 15 Sep 2025 11:08:39 +0300
Subject: [PATCH v3 1/2] ci: Fix Windows and MinGW tasks' namings

They use Windows Server 2022, not 2019.

Author: Nazir Bilal Yavuz <byavuz81@gmail.com>
Discussion: https://postgr.es/m/flat/CAN55FZ1OsaM+852BMQDJ+Kgfg+07knJ6dM3PjbGbtYaK4qwfqA@mail.gmail.com
---
 .cirrus.tasks.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml
index eca9d62fc22..12236569c13 100644
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@ -752,7 +752,7 @@ WINDOWS_ENVIRONMENT_BASE: &WINDOWS_ENVIRONMENT_BASE
 
 
 task:
-  name: Windows - Server 2019, VS 2019 - Meson & ninja
+  name: Windows - Server 2022, VS 2019 - Meson & ninja
   << : *WINDOWS_ENVIRONMENT_BASE
 
   env:
@@ -811,7 +811,7 @@ task:
 
 task:
   << : *WINDOWS_ENVIRONMENT_BASE
-  name: Windows - Server 2019, MinGW64 - Meson
+  name: Windows - Server 2022, MinGW64 - Meson
 
   # See REPO_CI_AUTOMATIC_TRIGGER_TASKS in .cirrus.star.
   trigger_type: $CI_TRIGGER_TYPE_MINGW
-- 
2.51.0

From 6f0f801e9e0b24682a537b78c9da4afcd25cdc41 Mon Sep 17 00:00:00 2001
From: Nazir Bilal Yavuz <byavuz81@gmail.com>
Date: Thu, 4 Sep 2025 17:20:18 +0300
Subject: [PATCH v3 2/2] ci: windows: Default to VS 2022, run VS 2019 task
 manually

Both VS 2019 and VS 2022 are available on the Windows image [1], but
since VS 2022 is the latest version, make it the default. The VS 2019
task is still available but must be triggered manually.

[1] https://github.com/anarazel/pg-vm-images/pull/116

Author: Nazir Bilal Yavuz <byavuz81@gmail.com>
Discussion: https://postgr.es/m/flat/CAN55FZ1OsaM+852BMQDJ+Kgfg+07knJ6dM3PjbGbtYaK4qwfqA@mail.gmail.com
---
 .cirrus.star      |  3 ++-
 .cirrus.tasks.yml | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.cirrus.star b/.cirrus.star
index e9bb672b959..cecd9bb026c 100644
--- a/.cirrus.star
+++ b/.cirrus.star
@@ -73,7 +73,7 @@ def compute_environment_vars():
     # REPO_CI_AUTOMATIC_TRIGGER_TASKS="task_name other_task" under "Repository
     # Settings" on Cirrus CI's website.
 
-    default_manual_trigger_tasks = ['mingw', 'netbsd', 'openbsd']
+    default_manual_trigger_tasks = ['mingw', 'netbsd', 'openbsd', 'vs2019']
 
     repo_ci_automatic_trigger_tasks = env.get('REPO_CI_AUTOMATIC_TRIGGER_TASKS', '')
     for task in default_manual_trigger_tasks:
@@ -103,6 +103,7 @@ def compute_environment_vars():
       'netbsd',
       'openbsd',
       'sanitycheck',
+      'vs2019',
       'windows',
     ]
     commit_message = env.get('CIRRUS_CHANGE_MESSAGE')
diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml
index 12236569c13..1c947874ae2 100644
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@ -752,7 +752,6 @@ WINDOWS_ENVIRONMENT_BASE: &WINDOWS_ENVIRONMENT_BASE
 
 
 task:
-  name: Windows - Server 2022, VS 2019 - Meson & ninja
   << : *WINDOWS_ENVIRONMENT_BASE
 
   env:
@@ -775,10 +774,21 @@ task:
       -Dplperl=enabled
       -Dplpython=enabled
 
+  matrix:
+    - name: Windows - Server 2022, VS 2022 - Meson & ninja
+      env:
+        # Use VS 2022
+        PATH: C:\VS_2022\VC\Auxiliary\Build;${PATH}
+      only_if: $CI_WINDOWS_ENABLED
+
+    # VS 2019 is the default VS installation
+    - name: Windows - Server 2022, VS 2019 - Meson & ninja
+      trigger_type: $CI_TRIGGER_TYPE_VS2019
+      only_if: $CI_VS2019_ENABLED
+
   <<: *windows_task_template
 
   depends_on: SanityCheck
-  only_if: $CI_WINDOWS_ENABLED
 
   setup_additional_packages_script: |
     REM choco install -y --no-progress ...
-- 
2.51.0

From 7a1f1df4345cdd401062adc046b74bc275f0b31a Mon Sep 17 00:00:00 2001
From: Nazir Bilal Yavuz <byavuz81@gmail.com>
Date: Fri, 19 Sep 2025 14:32:29 +0300
Subject: [PATCH v1] ci: Add CI_TASK_ONLY

Expand CI_OS_ONLY with CI_TASK_ONLY. This allows to differentiate OSes
from the tasks.
---
 .cirrus.star      | 111 +++++++++++++++++++++++++++++++++-------------
 .cirrus.tasks.yml |   2 +-
 2 files changed, 80 insertions(+), 33 deletions(-)

diff --git a/.cirrus.star b/.cirrus.star
index e9bb672b959..f718befa9c6 100644
--- a/.cirrus.star
+++ b/.cirrus.star
@@ -63,10 +63,9 @@ def main():
     return output
 
 
-def compute_environment_vars():
+def compute_automatic_trigger_tasks():
     cenv = {}
 
-    ###
     # Some tasks are manually triggered by default because they might use too
     # many resources for users of free Cirrus credits, but they can be
     # triggered automatically by naming them in an environment variable e.g.
@@ -83,42 +82,90 @@ def compute_environment_vars():
         else:
             value = 'manual'
         cenv[name] = value
-    ###
 
-    ###
-    # Parse "ci-os-only:" tag in commit message and set
-    # CI_{$OS}_ENABLED variable for each OS
+    return cenv
 
-    # We want to disable SanityCheck if testing just a specific OS. This
-    # shortens push-wait-for-ci cycle time a bit when debugging operating
-    # system specific failures. Just treating it as an OS in that case
+
+def compute_ci_regex_helper(name):
+    return r"(^|.*\n)ci-{}-only: ([^\n]+)($|\n.*)".format(name)
+
+def compute_ci_tasks(compute_ci_dict):
+    cenv = {}
+
+    # Parse "ci-{name}-only:" tag in commit message and set
+    # CI_${NAME}_ENABLED variable for each OS or task
+
+    # We want to disable SanityCheck if testing just a specific OS or task.
+    # This shortens push-wait-for-ci cycle time a bit when debugging operating
+    # system specific failures. Just treating it as an OS or task in that case
     # suffices.
-
-    operating_systems = [
-      'compilerwarnings',
-      'freebsd',
-      'linux',
-      'macos',
-      'mingw',
-      'netbsd',
-      'openbsd',
-      'sanitycheck',
-      'windows',
-    ]
     commit_message = env.get('CIRRUS_CHANGE_MESSAGE')
-    match_re = r"(^|.*\n)ci-os-only: ([^\n]+)($|\n.*)"
 
-    # re.match() returns an array with a tuple of (matched-string, match_1, ...)
-    m = re.match(match_re, commit_message)
-    if m and len(m) > 0:
-        os_only = m[0][2]
-        os_only_list = re.split(r'[, ]+', os_only)
-    else:
-        os_only_list = operating_systems
+    # Firstly, try to find if there is specification. If yes, then it is safe
+    # to disable not specified tasks.
+    specified = False
+    for name in compute_ci_dict:
+        match_re = compute_ci_regex_helper(name)
+        # re.match() returns an array with a tuple of (matched-string, match_1, ...)
+        m = re.match(match_re, commit_message)
+        if m and len(m) > 0:
+            # We have at least one specified task
+            specified = True
+            break
 
-    for os in operating_systems:
-        os_enabled = os in os_only_list
-        cenv['CI_{0}_ENABLED'.format(os.upper())] = os_enabled
+    for name in compute_ci_dict:
+        name_list = compute_ci_dict[name]
+
+        # Same as above
+        match_re = compute_ci_regex_helper(name)
+        m = re.match(match_re, commit_message)
+
+        name_only_list = []
+        if m and len(m) > 0:
+            name_only = m[0][2]
+            name_only_list = re.split(r'[, ]+', name_only)
+        elif not specified:
+            name_only_list = name_list
+
+        for name in name_list:
+            name_enabled = name in name_only_list
+            cenv['CI_{0}_ENABLED'.format(name.upper())] = name_enabled
+
+    return cenv
+
+
+def compute_environment_vars():
+    cenv = {}
+    cenv.update(compute_automatic_trigger_tasks())
+
+    ###
+    # Compute which tasks to run
+    compute_ci_dict = {}
+
+    operating_systems = {
+        'os':
+            [
+                'freebsd',
+                'linux',
+                'macos',
+                'netbsd',
+                'openbsd',
+                'windows',
+            ]
+    }
+    compute_ci_dict.update(operating_systems)
+
+    tasks = {
+        'task':
+            [
+                'compilerwarnings',
+                'mingw',
+                'sanitycheck',
+            ]
+    }
+    compute_ci_dict.update(tasks)
+
+    cenv.update(compute_ci_tasks(compute_ci_dict))
     ###
 
     return cenv
diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml
index eca9d62fc22..e655a95b45a 100644
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@ -817,7 +817,7 @@ task:
   trigger_type: $CI_TRIGGER_TYPE_MINGW
 
   depends_on: SanityCheck
-  only_if: $CI_MINGW_ENABLED
+  only_if: $CI_MINGW_ENABLED || $CI_WINDOWS_ENABLED
 
   env:
     TEST_JOBS: 4 # higher concurrency causes occasional failures
-- 
2.51.0