From 04f30658cdf83f47d822177993d99af2ddc17831 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 7 Oct 2022 02:34:11 +0200
Subject: [PATCH] Remove CI builds not using C++11

Also add MSVS 2019 and 2022 builds to AppVeyor.
---
 .github/workflows/ci.yml       |  2 +-
 .github/workflows/ci_cmake.yml |  1 -
 appveyor.yml                   | 14 +++++---------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dde8d63dd3..dabb4ae87e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -71,7 +71,7 @@ jobs:
             use_xvfb: true
           - name: Ubuntu 18.04 wxGTK 3 STL
             runner: ubuntu-18.04
-            configure_flags: --enable-cxx11 --enable-stl --disable-compat30
+            configure_flags: --enable-stl --disable-compat30
             use_xvfb: true
           - name: Ubuntu 18.04 wxGTK 3 with clang
             runner: ubuntu-18.04
diff --git a/.github/workflows/ci_cmake.yml b/.github/workflows/ci_cmake.yml
index 336403c5ab..6e5ba03c71 100644
--- a/.github/workflows/ci_cmake.yml
+++ b/.github/workflows/ci_cmake.yml
@@ -63,7 +63,6 @@ jobs:
           - name: macOS 11 wxOSX
             runner: macos-11
             cmake_generator: Xcode
-            cmake_defines: -DCMAKE_CXX_STANDARD=11
           - name: macOS 11 wxIOS
             runner: macos-11
             cmake_generator: Xcode
diff --git a/appveyor.yml b/appveyor.yml
index 2b16f4f34f..b8f430877d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,6 @@ version: '{build}'
 branches:
   only:
   - master
-  - WX_3_0_BRANCH
 
 skip_commits:
   files:
@@ -38,27 +37,24 @@ environment:
     CONFIGURATION: DLL Release
     ARCH: x64
     wxUSE_STL: 1
-  - TOOLSET: nmake
-    VS: '9.0'
-    BUILD: release
-    ARCH: x86
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
   - TOOLSET: nmake
     VS: '14.0'
     BUILD: debug
     ARCH: amd64
     wxUSE_STL: 1
     wxUSE_WEBVIEW_EDGE: 1
-  - TOOLSET: mingw
-  - TOOLSET: msys2
-    MSYSTEM: MINGW32
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
   - TOOLSET: cmake
-    GENERATOR: 'Visual Studio 12'
+    GENERATOR: 'Visual Studio 15 2017'
     SHARED: ON
     CONFIGURATION: Release
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   - TOOLSET: cmake_qt
     GENERATOR: 'Visual Studio 14 2015 Win64'
     SHARED: ON
     CONFIGURATION: Release
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
 clone_depth: 50