]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
patch 9.0.0847: CI: not totally clear what MS-Windows version is used v9.0.0847
authorK.Takata <kentkt@csc.jp>
Wed, 9 Nov 2022 16:12:47 +0000 (16:12 +0000)
committerBram Moolenaar <Bram@vim.org>
Wed, 9 Nov 2022 16:12:47 +0000 (16:12 +0000)
Problem:    CI: not totally clear what MS-Windows version is used.
Solution:   Show the Windows version. (Ken Takata, closes #11524)

.github/workflows/ci.yml
src/version.c

index 9ee8438a9e5196840c5a31889b3fe0d7fc309ca8..487012702726e916eb4488e1f4ec6c7bc3c9219a 100644 (file)
@@ -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/@")
index f305f3cc716bad48ff6d1634b947890c0408ebc7..5cc1b025de7dfea89f0dc3bf8d55a5547d78ed78 100644 (file)
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    847,
 /**/
     846,
 /**/