diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-23 22:27:22 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-23 22:27:22 +0200 |
| commit | 851d108313317a062371a6750e6c6bf370a9bafa (patch) | |
| tree | feb4338dc47420faa1a699b6c06be58329d337e6 | |
| parent | 148ce7ae62e92ecf6487a4ba5902ddb7e699074b (diff) | |
| download | vim-git-8.2.1735.tar.gz | |
patch 8.2.1735: Github actions appear to timeout too soonv8.2.1735
Problem: Github actions appear to timeout too soon.
Solution: use "timeout" instead of "ping".
| -rw-r--r-- | .github/workflows/ci-windows.yaml | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/ci-windows.yaml b/.github/workflows/ci-windows.yaml index 0fef20da5..6a5501f24 100644 --- a/.github/workflows/ci-windows.yaml +++ b/.github/workflows/ci-windows.yaml @@ -212,9 +212,9 @@ jobs: echo %COL_GREEN%Wait for vim tests to finish.%COL_RESET% cd ..\src2\testdir :: Wait about 10 minutes. - for /L %%i in (1,1,600) do ( + for /L %%i in (1,1,60) do ( if exist done.txt goto exitloop - ping -n 2 localhost > nul + timeout 10 ) set timeout=1 :exitloop diff --git a/src/version.c b/src/version.c index e5b5459b0..d85ac1b2d 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1735, +/**/ 1734, /**/ 1733, |