diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-03-07 08:34:15 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-03-07 08:34:15 -0500 |
| commit | d8409ccb76e1902e81f8f2c7d62babe64efd3e84 (patch) | |
| tree | 50b46fb7e229ae7e3ebf5ba47f73a98a8e83fb93 /.appveyor.yml | |
| parent | 9b4ecbaa7d5a19c2ddbb5e2c442e19c248930a7b (diff) | |
| parent | 78bfe731c3320437901d3801f54ade66a93bd227 (diff) | |
| download | tor-d8409ccb76e1902e81f8f2c7d62babe64efd3e84.tar.gz tor-d8409ccb76e1902e81f8f2c7d62babe64efd3e84.zip | |
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index b838055f46..f4fd3774b4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,10 +6,10 @@ clone_depth: 50 # But we compile using MinGW, not Visual Studio. # We use these images because they have different Windows versions. image: - # Windows Server 2012 R2 - - Visual Studio 2015 # Windows Server 2016 - Visual Studio 2017 + # Windows Server 2012 R2 + - Visual Studio 2015 environment: compiler: mingw @@ -25,6 +25,25 @@ environment: # hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8 hardening: --disable-gcc-hardening +matrix: + # Don't keep building failing jobs + fast_finish: true + # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server + # 2012 R2 job, to speed up the build. + # The environment variables must be listed without the 'environment' tag. + exclude: + - image: Visual Studio 2017 + target: i686-w64-mingw32 + compiler_path: mingw32 + mingw_prefix: mingw-w64-i686 + hardening: + - image: Visual Studio 2015 + target: x86_64-w64-mingw32 + compiler_path: mingw64 + mingw_prefix: mingw-w64-x86_64 + # hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8 + hardening: --disable-gcc-hardening + install: - ps: >- Function Execute-Command ($commandPath) |