aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.2.1330: Github workflow takes longer than needed

Browse Source 
Problem:    Github workflow takes longer than needed.
Solution:   Do two test runs in parallel instead of sequentially. (Ken Takata,
            closes #6579)
This commit is contained in:
Bram Moolenaar
2020-07-31 22:17:32 +02:00
parent 38ddf333f6
commit 3a53ec8bdd
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
.github/workflows/ci-windows.yaml vendored
View File

@@ -195,16 +195,29 @@ jobs:
echo. echo.
echo %COL_GREEN%vim version:%COL_RESET% echo %COL_GREEN%vim version:%COL_RESET%
.\vim --version || exit 1 .\vim --version || exit 1
cd testdir
mkdir ..\src2
xcopy testdir ..\src2\testdir\ /E > nul || exit 1
copy evalfunc.c ..\src2 > nul
echo %COL_GREEN%Start testing vim in background.%COL_RESET%
start cmd /c "cd ..\src2\testdir & nmake -nologo -f Make_dos.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt"
echo %COL_GREEN%Test gvim:%COL_RESET% echo %COL_GREEN%Test gvim:%COL_RESET%
cd testdir
nmake -nologo -f Make_dos.mak VIMPROG=..\gvim || exit 1 nmake -nologo -f Make_dos.mak VIMPROG=..\gvim || exit 1
nmake -nologo -f Make_dos.mak clean cd ..
echo %COL_GREEN%Test vim:%COL_RESET%
if "${{ matrix.toolchain }}-${{ matrix.arch }}"=="msvc-x64" ( echo %COL_GREEN%Wait for vim tests to finish.%COL_RESET%
rem This test may hang up unless it is executed in a separate console. cd ..\src2\testdir
start /wait cmd /c "nmake -nologo -f Make_dos.mak VIMPROG=..\vim > nul" :: Wait about 5 minutes.
if exist messages type messages for /L %%i in (1,1,300) do (
nmake -nologo -f Make_dos.mak report || exit 1 if exist done.txt goto exitloop
) else ( ping -n 2 localhost > nul
nmake -nologo -f Make_dos.mak VIMPROG=..\vim || exit 1
) )
echo %COL_RED%Timed out.%COL_RESET%
:exitloop
echo %COL_GREEN%Test results of vim:%COL_RESET%
if exist messages type messages
nmake -nologo -f Make_dos.mak report VIMPROG=..\..\src\vim || exit 1

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1330,
/**/ /**/
1329, 1329,
/**/ /**/