Skip to content

Commit 80613d6

Browse files
k-takatabrammool
authored andcommitted
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 #11524)
1 parent f220643 commit 80613d6

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,9 @@ jobs:
401401
id: init
402402
shell: bash
403403
run: |
404+
# Show Windows version
405+
cmd /c ver
406+
404407
git config --global core.autocrlf input
405408
406409
if [ "${{ matrix.arch }}" = "x64" ]; then
@@ -422,9 +425,9 @@ jobs:
422425
echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
423426
if [ "${{ matrix.features }}" != "TINY" ]; then
424427
if [ "${{ matrix.arch }}" = "x86" ]; then
425-
choco install python2 --forcex86
428+
choco install python2 --no-progress --forcex86
426429
else
427-
choco install python2
430+
choco install python2 --no-progress
428431
fi
429432
fi
430433
python3_dir=$(cat "/proc/$cygreg/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}$pyreg/InstallPath/@")

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
847,
698700
/**/
699701
846,
700702
/**/

0 commit comments

Comments
 (0)