1
0
forked from aniani/vim

patch 8.2.5086: CI runs on Windows 2019

Problem:    CI runs on Windows 2019.
Solution:   Switch to Windows 2022.
This commit is contained in:
Philip H
2022-06-14 11:35:21 +01:00
committed by Bram Moolenaar
parent 819ab82f7e
commit 361f9d2da4
2 changed files with 13 additions and 3 deletions

View File

@@ -355,7 +355,7 @@ jobs:
make ${TEST} make ${TEST}
windows: windows:
runs-on: windows-2019 runs-on: windows-2022
env: env:
# Interfaces # Interfaces
@@ -371,6 +371,7 @@ jobs:
# Python 2 # Python 2
PYTHON_VER: 27 PYTHON_VER: 27
PYTHON_VER_DOT: '2.7' PYTHON_VER_DOT: '2.7'
PYTHON_DIR: 'C:\Python27'
# Python 3 # Python 3
PYTHON3_VER: 310 PYTHON3_VER: 310
PYTHON3_VER_DOT: '3.10' PYTHON3_VER_DOT: '3.10'
@@ -423,14 +424,21 @@ jobs:
run: | run: |
git config --global core.autocrlf input git config --global core.autocrlf input
echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV 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/@") 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/@") 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 echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
if: matrix.toolchain == 'mingw' if: matrix.toolchain == 'mingw'
with: with:
update: true
install: tar
pacboy: >-
make:p gcc:p
msystem: ${{ matrix.msystem }} msystem: ${{ matrix.msystem }}
release: false release: false

View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
5086,
/**/ /**/
5085, 5085,
/**/ /**/