patch 8.2.4222: MS-Windows: clumsy way to suppress progress on CI
Problem: MS-Windows: clumsy way to suppress progress on CI.
Solution: Check for "$CI" in the Makefile itself. (Ken Takata, closes #9631)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2f0bc49..2c0857c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -472,17 +472,15 @@
run: |
call "%VCVARSALL%" ${{ matrix.vcarch }}
cd src
- :: Filter out the progress bar from the build log
- sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
if "${{ matrix.features }}"=="HUGE" (
- nmake -nologo -f Make_mvc2.mak ^
+ nmake -nologo -f Make_mvc.mak ^
FEATURES=${{ matrix.features }} ^
GUI=yes IME=yes ICONV=yes VIMDLL=yes ^
DYNAMIC_LUA=yes LUA=%LUA_DIR% ^
DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^
DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR%
) else (
- nmake -nologo -f Make_mvc2.mak ^
+ nmake -nologo -f Make_mvc.mak ^
FEATURES=${{ matrix.features }} ^
GUI=yes IME=yes ICONV=yes VIMDLL=yes
)