To: vim_dev@googlegroups.com
Subject: Patch 8.2.1330
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.1330
Problem:    Github workflow takes longer than needed.
Solution:   Do two test runs in parallel instead of sequentially. (Ken Takata,
            closes #6579)
Files:      .github/workflows/ci-windows.yaml


*** ../vim-8.2.1329/.github/workflows/ci-windows.yaml	2020-07-29 19:29:20.368813411 +0200
--- .github/workflows/ci-windows.yaml	2020-07-31 22:10:23.830865564 +0200
***************
*** 195,210 ****
          echo.
          echo %COL_GREEN%vim version:%COL_RESET%
          .\vim --version || exit 1
!         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
          )
--- 195,223 ----
          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
          nmake -nologo -f Make_dos.mak VIMPROG=..\gvim || 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
*** ../vim-8.2.1329/src/version.c	2020-07-31 22:04:59.776336159 +0200
--- src/version.c	2020-07-31 22:11:34.434539844 +0200
***************
*** 756,757 ****
--- 756,759 ----
  {   /* Add new patch number below this line */
+ /**/
+     1330,
  /**/

-- 
From "know your smileys":
 :-E	Has major dental problems

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///