Merge pull request #4220 from nulano/gha-win-update

Test Python 3.8 and PyPy3.6 on Windows with GitHub Actions
This commit is contained in:
Hugo van Kemenade 2019-11-21 20:24:04 +02:00 committed by GitHub
commit bd34b238f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -9,7 +9,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
python-version: ["3.5", "3.6", "3.7"] python-version: ["3.5", "3.6", "3.7", "3.8", "pypy3.6"]
architecture: ["x86", "x64"] architecture: ["x86", "x64"]
include: include:
- architecture: "x86" - architecture: "x86"
@ -324,6 +324,7 @@ jobs:
set LIB=%INCLIB%;%PYTHON%\tcl set LIB=%INCLIB%;%PYTHON%\tcl
set INCLUDE=%INCLIB%;%GITHUB_WORKSPACE%\depends\tcl86\include;%INCLUDE% set INCLUDE=%INCLIB%;%GITHUB_WORKSPACE%\depends\tcl86\include;%INCLUDE%
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.platform-vcvars }} call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.platform-vcvars }}
set MSSdk=1
set DISTUTILS_USE_SDK=1 set DISTUTILS_USE_SDK=1
set py_vcruntime_redist=true set py_vcruntime_redist=true
%PYTHON%\python.exe setup.py build_ext install %PYTHON%\python.exe setup.py build_ext install

View File

@ -3,16 +3,17 @@ import os
SF_MIRROR = "https://iweb.dl.sourceforge.net" SF_MIRROR = "https://iweb.dl.sourceforge.net"
pythons = { pythons = {
"pypy3": {"compiler": 7.1, "vc": 2015},
# for AppVeyor # for AppVeyor
"35": {"compiler": 7.1, "vc": 2015}, "35": {"compiler": 7.1, "vc": 2015},
"36": {"compiler": 7.1, "vc": 2015}, "36": {"compiler": 7.1, "vc": 2015},
"pypy3": {"compiler": 7.1, "vc": 2015},
"37": {"compiler": 7.1, "vc": 2015}, "37": {"compiler": 7.1, "vc": 2015},
"38": {"compiler": 7.1, "vc": 2015}, "38": {"compiler": 7.1, "vc": 2015},
# for GitHub Actions # for GitHub Actions
"3.5": {"compiler": 7.1, "vc": 2015}, "3.5": {"compiler": 7.1, "vc": 2015},
"3.6": {"compiler": 7.1, "vc": 2015}, "3.6": {"compiler": 7.1, "vc": 2015},
"3.7": {"compiler": 7.1, "vc": 2015}, "3.7": {"compiler": 7.1, "vc": 2015},
"3.8": {"compiler": 7.1, "vc": 2015},
} }
VIRT_BASE = "c:/vp/" VIRT_BASE = "c:/vp/"