Skip to content

Indicate pull request source in CDash Build Name. #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcfr merged 1 commit into from
Aug 24, 2015
Merged

Indicate pull request source in CDash Build Name. #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor_dashboard.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

@jcfr jcfr Aug 24, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo # -> $

@thewtex thewtex Aug 24, 2015

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The # was intended to indicate the pull request number. I can remove it if preferred.

@jcfr jcfr Aug 24, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see ... should it be escaped ? I just want to make sure it is not considered as a CMake comment.

@thewtex thewtex Aug 24, 2015

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using cmake -P with this content:

set(var_with_hash "this_has_a_#")
message(${var_with_hash})

verifies it should be OK.

set(CTEST_CONFIGURATION_TYPE $ENV{CONFIGURATION})
set(CTEST_CMAKE_GENERATOR "Visual Studio 9 2008")
if("$ENV{platform}" STREQUAL "x64")
Expand Down
2 changes: 1 addition & 1 deletion travis_dashboard.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

@jcfr jcfr Aug 24, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo # -> $

set(CTEST_CONFIGURATION_TYPE Release)
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(CTEST_BUILD_FLAGS "-j4")
Expand Down