patch 8.2.1334: Github workflow timeout needs tuning

Problem:    Github workflow timeout needs tuning
Solution:   Use a 10 minute timeout. Fail when timing out. (Ken Takata,
            closes #6590)

diff --git a/.github/workflows/ci-windows.yaml b/.github/workflows/ci-windows.yaml
index dbc9007534d06f9d902ed4d4b1aa3f988d79d77b..d23beef4148b4bb4716c50184303c679deb57570 100644 (file)
--- a/.github/workflows/ci-windows.yaml
+++ b/.github/workflows/ci-windows.yaml
@@ -210,14 +210,18 @@ jobs:
 
         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 (
+        :: Wait about 10 minutes.
+        for /L %%i in (1,1,600) do (
           if exist done.txt goto exitloop
           ping -n 2 localhost > nul
         )
-        echo %COL_RED%Timed out.%COL_RESET%
+        set timeout=1
         :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
+        if "%timeout%"=="1" (
+          echo %COL_RED%Timed out.%COL_RESET%
+          exit 1
+        )

diff --git a/src/version.c b/src/version.c
index 577a44bd6703fdffa14f277b1e3f213eb43fd702..f65d0fe6e38d495cbac05144692d1808f748da55 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1334,
 /**/
     1333,
 /**/