diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 194143040b..f9e108cccd 100644 --- 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 |