summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci-windows.yaml10
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 3 deletions
diff --git a/.github/workflows/ci-windows.yaml b/.github/workflows/ci-windows.yaml
index dbc9007534..d23beef414 100644
--- 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 577a44bd67..f65d0fe6e3 100644
--- 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 */
/**/
+ 1334,
+/**/
1333,
/**/
1332,