thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0847: CI: not totally clear what MS-Windows version is used

Browse Source 
Problem:    CI: not totally clear what MS-Windows version is used.
Solution:   Show the Windows version. (Ken Takata, closes #11524)
This commit is contained in:
K.Takata
2022-11-09 16:12:47 +00:00
committed by Bram Moolenaar
parent f220643c26
commit 80613d64e6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/ci.yml vendored
View File

@@ -401,6 +401,9 @@ jobs:
id: init id: init
shell: bash shell: bash
run: | run: |
# Show Windows version
cmd /c ver
git config --global core.autocrlf input git config --global core.autocrlf input
if [ "${{ matrix.arch }}" = "x64" ]; then if [ "${{ matrix.arch }}" = "x64" ]; then
@@ -422,9 +425,9 @@ jobs:
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
if [ "${{ matrix.features }}" != "TINY" ]; then if [ "${{ matrix.features }}" != "TINY" ]; then
if [ "${{ matrix.arch }}" = "x86" ]; then if [ "${{ matrix.arch }}" = "x86" ]; then
choco install python2 --forcex86 choco install python2 --no-progress --forcex86
else else
choco install python2 choco install python2 --no-progress
fi fi
fi fi
python3_dir=$(cat "/proc/$cygreg/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}$pyreg/InstallPath/@") python3_dir=$(cat "/proc/$cygreg/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}$pyreg/InstallPath/@")

2
src/version.c
View File

@@ -695,6 +695,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 */
/**/
847,
/**/ /**/
846, 846,
/**/ /**/