# HG changeset patch # User Bram Moolenaar # Date 1596277804 -7200 # Node ID a87ab06501ad7660fd120688ddfd2d2542dbe7d2 # Parent 31ec74ed42f58b1b991a7af6ea63fd32755cb99e patch 8.2.1334: Github workflow timeout needs tuning Commit: https://github.com/vim/vim/commit/b53da7918c643ef4de1256c37bc8b92413e6dcec Author: Bram Moolenaar Date: Sat Aug 1 12:26:04 2020 +0200 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 --- 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 --- 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,