To: vim_dev@googlegroups.com
Subject: Patch 8.2.5086
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.5086
Problem:    CI runs on Windows 2019.
Solution:   Switch to Windows 2022.
Files:      .github/workflows/ci.yml


*** ../vim-8.2.5085/.github/workflows/ci.yml	2022-06-01 21:26:30.069442412 +0100
--- .github/workflows/ci.yml	2022-06-14 11:33:37.300393552 +0100
***************
*** 355,361 ****
            make ${TEST}
  
    windows:
!     runs-on: windows-2019
  
      env:
        # Interfaces
--- 355,361 ----
            make ${TEST}
  
    windows:
!     runs-on: windows-2022
  
      env:
        # Interfaces
***************
*** 371,376 ****
--- 371,377 ----
        # Python 2
        PYTHON_VER: 27
        PYTHON_VER_DOT: '2.7'
+       PYTHON_DIR: 'C:\Python27'
        # Python 3
        PYTHON3_VER: 310
        PYTHON3_VER_DOT: '3.10'
***************
*** 423,436 ****
          run: |
            git config --global core.autocrlf input
            echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
!           python_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON_VER_DOT}/InstallPath/@")
            python3_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}${{ matrix.pyreg }}/InstallPath/@")
-           echo "PYTHON_DIR=$python_dir" >> $GITHUB_ENV
            echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV
  
        - uses: msys2/setup-msys2@v2
          if: matrix.toolchain == 'mingw'
          with:
            msystem: ${{ matrix.msystem }}
            release: false
  
--- 424,444 ----
          run: |
            git config --global core.autocrlf input
            echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
!           if [ "${{ matrix.arch }}" = "x86" ]; then
!             choco install python2 --forcex86
!           else
!             choco install python2
!           fi
            python3_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}${{ matrix.pyreg }}/InstallPath/@")
            echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV
  
        - uses: msys2/setup-msys2@v2
          if: matrix.toolchain == 'mingw'
          with:
+           update: true
+           install: tar
+           pacboy: >-
+             make:p gcc:p
            msystem: ${{ matrix.msystem }}
            release: false
  
*** ../vim-8.2.5085/src/version.c	2022-06-13 22:34:10.592709647 +0100
--- src/version.c	2022-06-14 11:35:01.364477097 +0100
***************
*** 736,737 ****
--- 736,739 ----
  {   /* Add new patch number below this line */
+ /**/
+     5086,
  /**/

-- 
Biting someone with your natural teeth is "simple assault," while biting
someone with your false teeth is "aggravated assault."
		[real standing law in Louisana, United States of America]

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