From 85ccf626d962ebfcdcffdc292888592829e87ba8 Mon Sep 17 00:00:00 2001 From: Ryan Metcalfe Date: Wed, 30 Oct 2024 18:16:52 -0700 Subject: [PATCH] ci: fix EOL issues with CMakeLists.txt patches --- tools/windows/build.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/windows/build.bat b/tools/windows/build.bat index de29d85..a31c12f 100644 --- a/tools/windows/build.bat +++ b/tools/windows/build.bat @@ -134,8 +134,8 @@ cd %AUDACITY_CLONE_DIR% git --version >nul 2>&1 IF NOT ERRORLEVEL 1 ( echo Applying patch using git command... - git apply %audacity_add_ov_mod_patch_path% || exit /b 1 - git apply %audacity_no_vc_runtime_install_patch% || exit /b 1 + git apply --ignore-whitespace %audacity_add_ov_mod_patch_path% || exit /b 1 + git apply --ignore-whitespace %audacity_no_vc_runtime_install_patch% || exit /b 1 ) ELSE ( :: Since git is not available, check if 'patch' command exists patch --version >nul 2>&1