# HG changeset patch # User Bram Moolenaar # Date 1668010505 -3600 # Node ID ce82378c6a471b0727cc33cbeda0cce639c9eff1 # Parent 698c297dd652595330f390db29b642f41c02ec0e patch 9.0.0847: CI: not totally clear what MS-Windows version is used Commit: https://github.com/vim/vim/commit/80613d64e69ccdac3dbf4eb06d55b2cf1218b819 Author: K.Takata Date: Wed Nov 9 16:12:47 2022 +0000 patch 9.0.0847: CI: not totally clear what MS-Windows version is used Problem: CI: not totally clear what MS-Windows version is used. Solution: Show the Windows version. (Ken Takata, closes https://github.com/vim/vim/issues/11524) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -401,6 +401,9 @@ jobs: id: init shell: bash run: | + # Show Windows version + cmd /c ver + git config --global core.autocrlf input if [ "${{ matrix.arch }}" = "x64" ]; then @@ -422,9 +425,9 @@ jobs: echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV if [ "${{ matrix.features }}" != "TINY" ]; then if [ "${{ matrix.arch }}" = "x86" ]; then - choco install python2 --forcex86 + choco install python2 --no-progress --forcex86 else - choco install python2 + choco install python2 --no-progress fi fi python3_dir=$(cat "/proc/$cygreg/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}$pyreg/InstallPath/@") diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 847, +/**/ 846, /**/ 845,