diff options
| author | Jack Lloyd <[email protected]> | 2019-01-03 09:23:39 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-01-03 09:23:39 -0500 |
| commit | 9eac958a79d1b9343837a71527a0a6af9e15008c (patch) | |
| tree | f367ae0ed3de6de443b3a5b75673217115459fc1 | |
| parent | d5edb39e968893bafe87a6a5ef12af45914c0d70 (diff) | |
| parent | 2be47e02033d815ea4811140fda7d9ecb26e1035 (diff) | |
Merge GH #1804 Add VC2019 preview build to CI
| -rw-r--r-- | src/lib/pubkey/mce/polyn_gf2m.h | 1 | ||||
| -rw-r--r-- | src/lib/utils/os_utils.h | 1 | ||||
| -rw-r--r-- | src/lib/utils/types.h | 2 | ||||
| -rw-r--r-- | src/scripts/ci/appveyor.yml | 8 | ||||
| -rw-r--r-- | src/scripts/ci/setup_appveyor.bat | 1 |
5 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/pubkey/mce/polyn_gf2m.h b/src/lib/pubkey/mce/polyn_gf2m.h index dd7c1081c..757a5883e 100644 --- a/src/lib/pubkey/mce/polyn_gf2m.h +++ b/src/lib/pubkey/mce/polyn_gf2m.h @@ -15,6 +15,7 @@ #include <botan/secmem.h> #include <botan/gf2m_small_m.h> #include <utility> +#include <string> namespace Botan { diff --git a/src/lib/utils/os_utils.h b/src/lib/utils/os_utils.h index a6044dd18..1ead2f9d1 100644 --- a/src/lib/utils/os_utils.h +++ b/src/lib/utils/os_utils.h @@ -10,6 +10,7 @@ #include <botan/types.h> #include <functional> +#include <string> namespace Botan { diff --git a/src/lib/utils/types.h b/src/lib/utils/types.h index f028ad66f..476701a1f 100644 --- a/src/lib/utils/types.h +++ b/src/lib/utils/types.h @@ -15,8 +15,6 @@ #include <cstddef> // IWYU pragma: export #include <cstdint> // IWYU pragma: export #include <memory> // IWYU pragma: export -#include <stdexcept> -#include <string> namespace Botan { diff --git a/src/scripts/ci/appveyor.yml b/src/scripts/ci/appveyor.yml index 66c266ef2..cdd62c3b4 100644 --- a/src/scripts/ci/appveyor.yml +++ b/src/scripts/ci/appveyor.yml @@ -33,12 +33,18 @@ environment: TARGET: static APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - # MSVC 2017 w/debug iterators + # MSVC 2017 x86-64 w/debug iterators - MSVS: 2017 PLATFORM: x86_amd64 TARGET: sanitizer APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + # MSVC 2019 static x86-64 + - MSVS: 2019 + PLATFORM: x86_amd64 + TARGET: static + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 Preview + install: - call src\scripts\ci\setup_appveyor.bat diff --git a/src/scripts/ci/setup_appveyor.bat b/src/scripts/ci/setup_appveyor.bat index 617774ed1..dccef0ab2 100644 --- a/src/scripts/ci/setup_appveyor.bat +++ b/src/scripts/ci/setup_appveyor.bat @@ -4,6 +4,7 @@ echo Current build setup MSVS="%MSVS%" PLATFORM="%PLATFORM%" TARGET="%TARGET%" if %MSVS% == 2013 call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %PLATFORM% if %MSVS% == 2015 call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM% if %MSVS% == 2017 call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM% +if %MSVS% == 2019 call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Preview\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM% rem check compiler version cl |