summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-01-26 16:20:21 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-26 16:20:21 +0000
commit47d1666d605998a97d3827eca4d467ad0930b284 (patch)
treeb61a572d2361815c6a28b2de9783354a40948064 /.github
parenta827bf3ea8fe465aa456ef7a7a37d6afe6a47628 (diff)
patch 8.2.4222: MS-Windows: clumsy way to suppress progress on CIv8.2.4222
Problem: MS-Windows: clumsy way to suppress progress on CI. Solution: Check for "$CI" in the Makefile itself. (Ken Takata, closes #9631)
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2f0bc49dd1..2c0857ca53 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -472,17 +472,15 @@ jobs:
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
)