Fix cookie with ActivateItems

[icinga2] / appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index 13f8ec1de78b749b37a42f31957e1f64c75a31b2..92dfe7befb8bf47d72ddb418c5d8fbaa5a0e7c12 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,12 +1,18 @@
 ---
-version: 2.9.0.dev.{build}
+version: 2.11.0.dev.{build}
 
 os: Visual Studio 2017
+platform: x64
 
 environment:
+  BITS: 64
+  CMAKE_BUILD_TYPE: Debug
   CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
-  BOOST_ROOT: 'C:\Libraries\boost_1_65_1'
-  BOOST_LIBRARYDIR: 'C:\Libraries\boost_1_65_1\lib64-msvc-14.1'
+  # https://www.appveyor.com/docs/windows-images-software/#boost
+  BOOST_ROOT: 'C:\Libraries\boost_1_67_0'
+  BOOST_LIBRARYDIR: 'C:\Libraries\boost_1_67_0\lib64-msvc-14.1'
+  # https://www.appveyor.com/docs/windows-images-software/#tools
+  OPENSSL_ROOT_DIR: 'C:\OpenSSL-v111-Win64'
   BISON_BINARY: 'C:\ProgramData\chocolatey\lib\winflexbison3\tools\win_bison.exe'
   FLEX_BINARY: 'C:\ProgramData\chocolatey\lib\winflexbison3\tools\win_flex.exe'
 
@@ -15,37 +21,36 @@ branches:
     - master
 
 cache:
-- build
-- vendor -> tools\win32\download-openssl.ps1
+- build -> appveyor.yml
 - C:\ProgramData\chocolatey\lib\winflexbison3
 
 install:
-- ps: |
-    if (-not (Test-Path "vendor\OpenSSL")) {
-      .\tools\win32\download-openssl.ps1
-      if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }
-    }
 - ps: |
     if (-not (Test-Path "C:\ProgramData\chocolatey\lib\winflexbison3")) {
-      choco install winflexbison3
-      if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }
+      & choco install winflexbison3
+      if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
     }
 
+# why that env handling, see
+# https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell#comment_44999171
 before_build:
 - ps: |
-    .\tools\win32\configure.ps1
-    if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }
+    & .\tools\win32\load-vsenv.ps1
+
+    & powershell.exe .\tools\win32\configure.ps1
+    if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
+
     del build\Icinga*.msi
 
 build_script:
 - ps: |
-    .\tools\win32\build.ps1
-    if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }
+    & powershell.exe .\tools\win32\build.ps1
+    if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
 
 test_script:
 - ps: |
-    .\tools\win32\test.ps1
-    if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }
+    & powershell.exe .\tools\win32\test.ps1
+    if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
 
 # Disable until we really need them
 # https://github.com/Icinga/icinga2/issues/6106