From 04512b5b89717233073b00f1400294a4a89a3938 Mon Sep 17 00:00:00 2001
From: Martin Matuska <martin@matuska.de>
Date: Mon, 1 Apr 2024 19:41:19 +0200
Subject: [PATCH] ci: use liblzma 1.5.5 in MSVC build until fix from upstream
 (#2105)

Signed-off-by: Duncan Horn
---
 build/ci/github_actions/ci.cmd | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/ci/github_actions/ci.cmd b/build/ci/github_actions/ci.cmd
index 0a50f1c9a..990475d1b 100755
--- a/build/ci/github_actions/ci.cmd
+++ b/build/ci/github_actions/ci.cmd
@@ -2,7 +2,6 @@
 SET ZLIB_VERSION=1.3
 SET BZIP2_VERSION=1ea1ac188ad4b9cb662e3f8314673c63df95a589
 SET XZ_VERSION=5.4.4
-SET ZSTD_VERSION=1.5.6
 IF NOT "%BE%"=="mingw-gcc" (
   IF NOT "%BE%"=="msvc" (
     ECHO Environment variable BE must be mingw-gcc or msvc
@@ -10,6 +9,15 @@ IF NOT "%BE%"=="mingw-gcc" (
   )
 )
 
+REM v1.5.6 has a bug with the CMake files & MSVC
+REM https://github.com/facebook/zstd/issues/3999
+REM Fall back to 1.5.5 for MSVC until fixed
+IF "%BE%"=="msvc" (
+  SET ZSTD_VERSION=1.5.5
+) ELSE (
+  SET ZSTD_VERSION=1.5.6
+)
+
 SET ORIGPATH=%PATH%
 IF "%BE%"=="mingw-gcc" (
   SET MINGWPATH=C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\cmake\bin;C:\ProgramData\mingw64\mingw64\bin
-- 
2.47.2