commit 89ead08eefbb2ab4201bc8286afcf99b1286bafc
parent e483257e1bc826b5678fcbf13084fd5d811f2b12
Author: Nick Mathewson <nickm@torproject.org>
Date: Mon, 21 Oct 2019 18:44:44 -0400
Merge branch 'maint-0.3.5' into maint-0.4.0
Diffstat:
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -6,8 +6,8 @@ clone_depth: 50
# But we compile using MinGW, not Visual Studio.
# We use these images because they have different Windows versions.
image:
- # Windows Server 2016
- - Visual Studio 2017
+ # Windows Server 2019
+ - Visual Studio 2019
# Windows Server 2012 R2
- Visual Studio 2015
@@ -28,11 +28,11 @@ environment:
matrix:
# Don't keep building failing jobs
fast_finish: true
- # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server
+ # Skip the 32-bit Windows Server 2019 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
+ - image: Visual Studio 2019
target: i686-w64-mingw32
compiler_path: mingw32
mingw_prefix: mingw-w64-i686
diff --git a/changes/ticket32086 b/changes/ticket32086
@@ -0,0 +1,3 @@
+ o Testing:
+ - Use Windows Server 2019 instead of Windows Server 2016 in our
+ Appveyor builds. Closes ticket 32086.