Mercurial > vim

changeset 29132:8957a70ce228 v8.2.5086

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.5086: CI runs on Windows 2019 Commit: https://github.com/vim/vim/commit/361f9d2da4eee27797deaa3283c5054106324b09 Author: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Tue Jun 14 11:35:21 2022 +0100 patch 8.2.5086: CI runs on Windows 2019 Problem: CI runs on Windows 2019. Solution: Switch to Windows 2022.
author Bram Moolenaar <Bram@vim.org>
date Tue, 14 Jun 2022 12:45:03 +0200
parents cc6c79c355ec
children 3e53cde225df
files .github/workflows/ci.yml src/version.c
diffstat 2 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -355,7 +355,7 @@ jobs:
           make ${TEST}
 
   windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     env:
       # Interfaces
@@ -371,6 +371,7 @@ jobs:
       # Python 2
       PYTHON_VER: 27
       PYTHON_VER_DOT: '2.7'
+      PYTHON_DIR: 'C:\Python27'
       # Python 3
       PYTHON3_VER: 310
       PYTHON3_VER_DOT: '3.10'
@@ -423,14 +424,21 @@ jobs:
         run: |
           git config --global core.autocrlf input
           echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
-          python_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON_VER_DOT}/InstallPath/@")
+          if [ "${{ matrix.arch }}" = "x86" ]; then
+            choco install python2 --forcex86
+          else
+            choco install python2
+          fi
           python3_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}${{ matrix.pyreg }}/InstallPath/@")
-          echo "PYTHON_DIR=$python_dir" >> $GITHUB_ENV
           echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV
 
       - uses: msys2/setup-msys2@v2
         if: matrix.toolchain == 'mingw'
         with:
+          update: true
+          install: tar
+          pacboy: >-
+            make:p gcc:p
           msystem: ${{ matrix.msystem }}
           release: false
 
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5086,
+/**/
     5085,
 /**/
     5084,