Merge pull request #272 from scottwittenburg/fix-master-build-branch-name

CI Fixes: master build name + test configuration type

appveyor.yml

@@ -22,7 +22,12 @@ before_build:
 - cd C:\projects\adios2
 - git reset --hard %APPVEYOR_PULL_REQUEST_HEAD_COMMIT%
 - ps: |
-    $env:CUSTOM_BUILD_NAME = ("{0}_{1}_vs{2}" -f $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH, $env:APPVEYOR_BUILD_NUMBER, $env:APPVEYOR_BUILD_WORKER_IMAGE.split()[2] )
+    if(Test-Path env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) {
+        $env:BUILD_NAME_BRANCH = $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH
+    } else {
+        $env:BUILD_NAME_BRANCH = $env:APPVEYOR_REPO_BRANCH
+    }
+    $env:CUSTOM_BUILD_NAME = ("{0}_{1}_vs{2}" -f $env:BUILD_NAME_BRANCH, $env:APPVEYOR_BUILD_NUMBER, $env:APPVEYOR_BUILD_WORKER_IMAGE.split()[2] )
 - ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
     -Ddashboard_full=OFF
     -Ddashboard_do_update=true

scripts/appveyor/av_default.cmake

 # Client maintainer: chuck.atkins@kitware.com
 set(CTEST_SITE "AppVeyor")
 set(CTEST_BUILD_CONFIGURATION Release)
-set(CTEST_CONFIGURATION_TYPE Release)
 set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
 set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
 

scripts/dashboard/common.cmake

@@ -131,12 +131,15 @@ if(NOT "${dashboard_model}" MATCHES "^(Nightly|Experimental)$")
   message(FATAL_ERROR "dashboard_model must be Nightly or Experimental")
 endif()
 
-
 # Default to a Debug build.
 if(NOT DEFINED CTEST_BUILD_CONFIGURATION)
   set(CTEST_BUILD_CONFIGURATION Debug)
 endif()
 
+if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
+  set(CTEST_CONFIGURATION_TYPE ${CTEST_BUILD_CONFIGURATION})
+endif()
+
 # Choose CTest reporting mode.
 if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   # Launchers work only with Makefile and Ninja generators.