Unverified Commit bed43901 authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'origin/maint-0.3.5' into maint-0.3.5

parents 4c4a0d50 f420b60c

.appveyor.yml

+4 −4
Original line number Diff line number Diff line
@@ -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

changes/ticket32086

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Testing:

    - Use Windows Server 2019 instead of Windows Server 2016 in our

      Appveyor builds. Closes ticket 32086.