Switch AppVeyor back to use a matrix to allow for faster re-runs on intermittent failure
diff --git a/appveyor.yml b/appveyor.yml
index 8f01780..f8d2690 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,15 +1,34 @@
version: "{build}"
skip_tags: true
+environment:
+ matrix:
+ - PYTHON_EXE: "C:\\Python26\\python.exe"
+ - PYTHON_EXE: "C:\\Python26-x64\\python.exe"
+ - PYTHON_EXE: "C:\\Python27\\python.exe"
+ - PYTHON_EXE: "C:\\Python27\\python.exe"
+ OSCRYPTO_USE_WINLEGACY: "true"
+ - PYTHON_EXE: "C:\\Python27-x64\\python.exe"
+ - PYTHON_EXE: "C:\\Python33\\python.exe"
+ - PYTHON_EXE: "C:\\Python33\\python.exe"
+ OSCRYPTO_USE_WINLEGACY: "true"
+ - PYTHON_EXE: "C:\\Python33-x64\\python.exe"
+ - PYTHON_EXE: "C:\\Python36\\python.exe"
+ - PYTHON_EXE: "C:\\Python36-x64\\python.exe"
+ - PYTHON_EXE: "C:\\pypy2-v5.10.0-win32\\pypy.exe"
+ - PYTHON_EXE: "C:\\pypy2-v5.10.0-win32\\pypy.exe"
+ OSCRYPTO_USE_WINLEGACY: "true"
install:
- ps: |-
$env:PYTMP = "${env:TMP}\py";
if (!(Test-Path "$env:PYTMP")) {
New-Item -ItemType directory -Path "$env:PYTMP" | Out-Null;
}
- if (!(Test-Path "${env:PYTMP}\pypy2-v5.10.0-win32.zip")) {
- (New-Object Net.WebClient).DownloadFile('https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-win32.zip', "${env:PYTMP}\pypy2-v5.10.0-win32.zip");
+ if ("${env:PYTHON_EXE}" -eq "C:\pypy2-v5.10.0-win32\pypy.exe") {
+ if (!(Test-Path "${env:PYTMP}\pypy2-v5.10.0-win32.zip")) {
+ (New-Object Net.WebClient).DownloadFile('https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-win32.zip', "${env:PYTMP}\pypy2-v5.10.0-win32.zip");
+ }
+ 7z x -y "${env:PYTMP}\pypy2-v5.10.0-win32.zip" -oC:\ | Out-Null;
}
- 7z x -y "${env:PYTMP}\pypy2-v5.10.0-win32.zip" -oC:\ | Out-Null;
[Byte[]] $geotrustCaBytes = 0x30,0x82,0x03,0x7C,0x30,0x82,0x02,0x64,0xA0,0x03,0x02,0x01,0x02,
0x02,0x10,0x18,0xAC,0xB5,0x6A,0xFD,0x69,0xB6,0x15,0x3A,0x63,0x6C,0xAF,0xDA,0xFA,0xC4,0xA1,0x30,
@@ -69,29 +88,5 @@
- '%TMP%\py\'
build: off
test_script:
- - ps: '& C:\Python26\python run.py deps'
- - ps: '& C:\Python26\python run.py ci'
- - ps: '& C:\Python26-x64\python run.py deps'
- - ps: '& C:\Python26-x64\python run.py ci'
- - ps: '& C:\Python27\python run.py deps'
- - ps: '& C:\Python27\python run.py ci'
- - ps: >
- $env:OSCRYPTO_USE_WINLEGACY = "true";
- & C:\Python27\python run.py ci;
- remove-item env:\OSCRYPTO_USE_WINLEGACY;
- - ps: '& C:\Python27-x64\python run.py deps'
- - ps: '& C:\Python27-x64\python run.py ci'
- - ps: '& C:\Python33\python run.py deps'
- - ps: '& C:\Python33\python run.py ci'
- - ps: >
- $env:OSCRYPTO_USE_WINLEGACY = "true";
- & C:\Python33\python run.py ci;
- remove-item env:\OSCRYPTO_USE_WINLEGACY;
- - ps: '& C:\Python33-x64\python run.py deps'
- - ps: '& C:\Python33-x64\python run.py ci'
- - ps: '& C:\pypy2-v5.10.0-win32\pypy run.py deps'
- - ps: '& C:\pypy2-v5.10.0-win32\pypy run.py ci'
- - ps: >
- $env:OSCRYPTO_USE_WINLEGACY = "true";
- & C:\pypy2-v5.10.0-win32\pypy run.py ci;
- remove-item env:\OSCRYPTO_USE_WINLEGACY;
+ - cmd: "%PYTHON_EXE% run.py deps"
+ - cmd: "%PYTHON_EXE% run.py ci"