diff options
author | K.Takata <kentkt@csc.jp> | 2022-11-09 16:12:47 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-11-09 16:12:47 +0000 |
commit | 80613d64e69ccdac3dbf4eb06d55b2cf1218b819 (patch) | |
tree | f1f3322d9437ac50c9b610aa46a588cfa36682c6 | |
parent | f220643c260d55d21a841a3c4032daadc41bc50b (diff) | |
download | vim-git-80613d64e69ccdac3dbf4eb06d55b2cf1218b819.tar.gz |
patch 9.0.0847: CI: not totally clear what MS-Windows version is usedv9.0.0847
Problem: CI: not totally clear what MS-Windows version is used.
Solution: Show the Windows version. (Ken Takata, closes #11524)
-rw-r--r-- | .github/workflows/ci.yml | 7 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ee8438a9..487012702 100644 --- 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 index f305f3cc7..5cc1b025d 100644 --- 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, |