nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 22:53:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5' into maint-0.4.0

Browse Source
This commit is contained in:
Nick Mathewson 2019-10-21 18:44:44 -04:00
commit 89ead08eef
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.appveyor.yml
View File

@ -6,8 +6,8 @@ clone_depth: 50
# But we compile using MinGW, not Visual Studio. # But we compile using MinGW, not Visual Studio.
# We use these images because they have different Windows versions. # We use these images because they have different Windows versions.
image: image:
# Windows Server 2016 # Windows Server 2019
- Visual Studio 2017 - Visual Studio 2019
# Windows Server 2012 R2 # Windows Server 2012 R2
- Visual Studio 2015 - Visual Studio 2015
@ -28,11 +28,11 @@ environment:
matrix: matrix:
# Don't keep building failing jobs # Don't keep building failing jobs
fast_finish: true 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. # 2012 R2 job, to speed up the build.
# The environment variables must be listed without the 'environment' tag. # The environment variables must be listed without the 'environment' tag.
exclude: exclude:
- image: Visual Studio 2017 - image: Visual Studio 2019
target: i686-w64-mingw32 target: i686-w64-mingw32
compiler_path: mingw32 compiler_path: mingw32
mingw_prefix: mingw-w64-i686 mingw_prefix: mingw-w64-i686

3
changes/ticket32086 Normal file
View File

@ -0,0 +1,3 @@
o Testing:
- Use Windows Server 2019 instead of Windows Server 2016 in our
Appveyor builds. Closes ticket 32086.