From 4a2ce09039dcb78c837d67e2ec1f84a8ae7645c6 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@kullo.net>
Date: Sun, 16 Oct 2016 11:29:18 +0200
Subject: AppVeyor: Whitelist branches to avoid testing feature branches twice

(as branch and as pull request). This is only relevant for Jack's PRs
since he is the only one creating feature branches in the
randombit/botan repository.
---
 src/scripts/ci/appveyor.yml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/scripts/ci/appveyor.yml')

diff --git a/src/scripts/ci/appveyor.yml b/src/scripts/ci/appveyor.yml
index 17cf86fdd..9e40d47e7 100644
--- a/src/scripts/ci/appveyor.yml
+++ b/src/scripts/ci/appveyor.yml
@@ -45,3 +45,8 @@ build_script:
   - jom -j2
   - botan-test
   - nmake install
+
+# whitelist branches to avoid testing feature branches twice (as branch and as pull request)
+branches:
+  only:
+    - master
-- 
cgit v1.2.3


From 588ab9eee5e69787e1758ccd72f626afa5c89a89 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@kullo.net>
Date: Sun, 16 Oct 2016 11:47:54 +0200
Subject: AppVeyor: Implement 8 job build matrix

---
 src/scripts/ci/appveyor.yml | 78 +++++++++++++++++++++++++++++++++------------
 1 file changed, 57 insertions(+), 21 deletions(-)

(limited to 'src/scripts/ci/appveyor.yml')

diff --git a/src/scripts/ci/appveyor.yml b/src/scripts/ci/appveyor.yml
index 9e40d47e7..8552cf9df 100644
--- a/src/scripts/ci/appveyor.yml
+++ b/src/scripts/ci/appveyor.yml
@@ -1,33 +1,69 @@
 os: Visual Studio 2015
 
-platform:
-  - x86
-  - x86_amd64
-
-configuration:
-  - Release
-  - Debug
+# Let's call MSVS 2015 the default compiler, 64 bit the default architecture,
+# release the default configuration and --enable-shared the default mode.
+#
+# Build jobs
+#  1. four basic builds: 32/64bit on MSVS2013/2015
+#  2. add static lib and amalgamation
+#  3. add a debug build on MSVS2013/2015
+#
+# Note: Avoid the AppVeyor settings `platform` and `configuration` since excluding
+# from the build matrix is not supported (https://github.com/appveyor/ci/issues/386)
 
 environment:
   matrix:
-    - COMPILER: msvc-12.0
-      MODE: --enable-shared
-    - COMPILER: msvc-12.0
-      MODE: --disable-shared
-    - COMPILER: msvc-12.0
-      MODE: --amalgamation
-    - COMPILER: msvc-14.0
-      MODE: --enable-shared
-    - COMPILER: msvc-14.0
+    # 1
+    - MSVS: 2013
+      PLATFORM: x86
+      CONFIG:
+      MODE:
+    - MSVS: 2013
+      PLATFORM: x86_amd64
+      CONFIG:
+      MODE:
+    - MSVS: 2015
+      PLATFORM: x86
+      CONFIG:
+      MODE:
+    - MSVS: 2015
+      PLATFORM: x86_amd64
+      CONFIG:
+      MODE:
+    # 2
+    - MSVS:
+      PLATFORM:
+      CONFIG:
       MODE: --disable-shared
-    - COMPILER: msvc-14.0
+    - MSVS:
+      PLATFORM:
+      CONFIG:
       MODE: --amalgamation
+    # 3
+    - MSVS: 2013
+      PLATFORM:
+      CONFIG: Debug
+      MODE:
+    - MSVS: 2015
+      PLATFORM:
+      CONFIG: Debug
+      MODE:
 
 install:
-  - if %compiler% == msvc-12.0 (
+  # Set defaults
+  - if [%MSVS%] == [] set MSVS=2015
+  - if [%PLATFORM%] == [] set PLATFORM=x86_amd64
+  - if [%CONFIG%] == [] set CONFIG=Release
+  - if [%MODE%] == [] set MODE=--enable-shared
+
+  # Check setup
+  - echo Current build setup MSVS="%MSVS%" PLATFORM="%PLATFORM%" CONFIG="%CONFIG%" MODE="%MODE%"
+
+  # Choose compiler
+  - if %MSVS% == 2013 (
        call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %PLATFORM%
     )
-  - if %compiler% == msvc-14.0 (
+  - if %MSVS% == 2015 (
        call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM%
     )
   - cl # check compiler version
@@ -36,10 +72,10 @@ install:
   - 7z e jom.zip
 
 build_script:
-  - if %configuration% == Release (
+  - if %CONFIG% == Release (
        python configure.py --cc=msvc --cpu=%PLATFORM% %MODE% --with-pkcs11
     )
-  - if %configuration% == Debug (
+  - if %CONFIG% == Debug (
        python configure.py --cc=msvc --cpu=%PLATFORM% %MODE% --with-pkcs11 --debug-mode
     )
   - jom -j2
-- 
cgit v1.2.3