Mercurial > vim

changeset 21560:614fcbd8275e v8.2.1330

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1330: Github workflow takes longer than needed Commit: https://github.com/vim/vim/commit/3a53ec8bdddccf06a0e9db263277c50a6015294d Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jul 31 22:17:32 2020 +0200 patch 8.2.1330: Github workflow takes longer than needed Problem: Github workflow takes longer than needed. Solution: Do two test runs in parallel instead of sequentially. (Ken Takata, closes #6579)
author Bram Moolenaar <Bram@vim.org>
date Fri, 31 Jul 2020 22:30:04 +0200
parents aa76456cbc57
children 67a2eea13464
files .github/workflows/ci-windows.yaml src/version.c
diffstat 2 files changed, 25 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/.github/workflows/ci-windows.yaml
+++ b/.github/workflows/ci-windows.yaml
@@ -195,16 +195,29 @@ jobs:
         echo.
         echo %COL_GREEN%vim version:%COL_RESET%
         .\vim --version || exit 1
+
+        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%
         cd testdir
-        echo %COL_GREEN%Test gvim:%COL_RESET%
         nmake -nologo -f Make_dos.mak VIMPROG=..\gvim || exit 1
-        nmake -nologo -f Make_dos.mak clean
-        echo %COL_GREEN%Test vim:%COL_RESET%
-        if "${{ matrix.toolchain }}-${{ matrix.arch }}"=="msvc-x64" (
-          rem This test may hang up unless it is executed in a separate console.
-          start /wait cmd /c "nmake -nologo -f Make_dos.mak VIMPROG=..\vim > nul"
-          if exist messages type messages
-          nmake -nologo -f Make_dos.mak report || exit 1
-        ) else (
-          nmake -nologo -f Make_dos.mak VIMPROG=..\vim || exit 1
+        cd ..
+
+        echo %COL_GREEN%Wait for vim tests to finish.%COL_RESET%
+        cd ..\src2\testdir
+        :: Wait about 5 minutes.
+        for /L %%i in (1,1,300) do (
+          if exist done.txt goto exitloop
+          ping -n 2 localhost > nul
         )
+        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
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1330,
+/**/
     1329,
 /**/
     1328,