From a3261bffa4ba903a735d2782986979908e25dc69 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 24 Aug 2015 15:20:44 -0400 Subject: [PATCH] Indicate pull request source in CDash Build Name. The pull request number is added as documented for Travis at http://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables The pull request title and number is added as documented for Appveyor at http://www.appveyor.com/docs/environment-variables --- appveyor_dashboard.cmake | 2 +- travis_dashboard.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor_dashboard.cmake b/appveyor_dashboard.cmake index 2266e03bb..92d177d17 100644 --- a/appveyor_dashboard.cmake +++ b/appveyor_dashboard.cmake @@ -6,7 +6,7 @@ set(PY_VERSION_PATCH 8) # Value should match the default set in CMakeLists.txt if(NOT "$ENV{PY_VERSION_PATCH}" STREQUAL "") set(PY_VERSION_PATCH "$ENV{PY_VERSION_PATCH}") endif() -set(CTEST_BUILD_NAME "2.7.${PY_VERSION_PATCH}-VS-$ENV{PLATFORM}-$ENV{CONFIGURATION}_$ENV{APPVEYOR_REPO_BRANCH}_${commit}") +set(CTEST_BUILD_NAME "2.7.${PY_VERSION_PATCH}-VS-$ENV{PLATFORM}-$ENV{CONFIGURATION}_$ENV{APPVEYOR_PULL_REQUEST_TITLE}_#$ENV{APPVEYOR_PULL_REQUEST_NUMBER}_${commit}") set(CTEST_CONFIGURATION_TYPE $ENV{CONFIGURATION}) set(CTEST_CMAKE_GENERATOR "Visual Studio 9 2008") if("$ENV{platform}" STREQUAL "x64") diff --git a/travis_dashboard.cmake b/travis_dashboard.cmake index 65c8dd670..8f9ab08a9 100644 --- a/travis_dashboard.cmake +++ b/travis_dashboard.cmake @@ -8,7 +8,7 @@ set(PY_VERSION_PATCH 8) # Value should match the default set in CMakeLists.txt if(NOT "$ENV{PY_VERSION_PATCH}" STREQUAL "") set(PY_VERSION_PATCH "$ENV{PY_VERSION_PATCH}") endif() -set(CTEST_BUILD_NAME "2.7.${PY_VERSION_PATCH}-$ENV{TRAVIS_OS_NAME}-${compiler_name}_$ENV{TRAVIS_BRANCH}_${commit}") +set(CTEST_BUILD_NAME "2.7.${PY_VERSION_PATCH}-$ENV{TRAVIS_OS_NAME}-${compiler_name}_#$ENV{TRAVIS_PULL_REQUEST}_${commit}") set(CTEST_CONFIGURATION_TYPE Release) set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_BUILD_FLAGS "-j4")