Browse Source

ci: Restore support for Windows 7 in official precompiled binaries

Since commit ffa010e32d (ci: Update Windows jobs to VS 2026, 2025-11-21,
v4.2.1~28^2) we link to a MSVC C++ runtime library that implements
`std::chrono::system_clock::now()` via `GetSystemTimePreciseAsFileTime`,
which is only available on Windows 8 and above.  Restore support for
Windows 7 by reverting `windows-{x86_64,i386}` packaging from MSVC 14.50
to MSVC 14.44.

Fixes: #27446
Brad King 4 months ago
parent
commit
01cbab956e
2 changed files with 19 additions and 4 deletions
  1. 2 2
      .gitlab-ci.yml
  2. 17 2
      .gitlab/os-windows.yml

+ 2 - 2
.gitlab-ci.yml

@@ -1625,7 +1625,7 @@ b:windows-x86_64-package:
         - .windows_x86_64_package
         - .cmake_build_windows
         - .cmake_build_package_artifacts
-        - .windows_x86_64_tags_nonconcurrent_vs2026
+        - .windows_x86_64_tags_nonconcurrent_vs2022_msvc14.44
         - .run_only_for_package
     needs:
         - p:doc-package
@@ -1656,7 +1656,7 @@ b:windows-i386-package:
         - .windows_i386_package
         - .cmake_build_windows
         - .cmake_build_package_artifacts
-        - .windows_x86_64_tags_nonconcurrent_vs2026
+        - .windows_x86_64_tags_nonconcurrent_vs2022_msvc14.44
         - .run_only_for_package
     needs:
         - p:doc-package

+ 17 - 2
.gitlab/os-windows.yml

@@ -43,6 +43,12 @@
         VCVARSPLATFORM: "x64"
         VCVARSVERSION: "14.44.35207"
 
+.windows_vcvarsall_vs2022_x86_msvc14.44:
+    variables:
+        VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+        VCVARSPLATFORM: "x86"
+        VCVARSVERSION: "14.44.35207"
+
 .windows_vcvarsall_vs2026_x64:
     variables:
         VCVARSALL: "${VS180COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
@@ -101,7 +107,7 @@
 .windows_x86_64_package:
     extends:
         - .windows_package
-        - .windows_vcvarsall_vs2026_x64
+        - .windows_vcvarsall_vs2022_x64_msvc14.44
 
     variables:
         CMAKE_CONFIGURATION: windows_x86_64_package
@@ -109,7 +115,7 @@
 .windows_i386_package:
     extends:
         - .windows_package
-        - .windows_vcvarsall_vs2026_x86
+        - .windows_vcvarsall_vs2022_x86_msvc14.44
 
     variables:
         CMAKE_CONFIGURATION: windows_i386_package
@@ -403,6 +409,15 @@
         - msvc-14.50
         - concurrent
 
+.windows_x86_64_tags_nonconcurrent_vs2022_msvc14.44:
+    tags:
+        - cmake # Since this is a bare runner, pin to a project.
+        - windows-x86_64
+        - shell
+        - vs2022
+        - msvc-14.44
+        - nonconcurrent
+
 .windows_x86_64_tags_concurrent_vs2022_msvc14.44:
     tags:
         - cmake # Since this is a bare runner, pin to a project.