mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-21 14:40:26 -06:00
Change the nightly tests to build from the nightly branch and not next.
This will make sure that the nightly test matches the dashboard nightly section. When it was next, it used next from when the test was run.
This commit is contained in:
@@ -321,7 +321,7 @@ IF(BUILD_TESTING)
|
||||
FILE(MAKE_DIRECTORY "${_TEST_DIR}")
|
||||
FILE(WRITE "${_TEST_DIR}/nightly-cmake.sh"
|
||||
"cd ${_TEST_DIR}
|
||||
${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=next -P ${CMake_SOURCE_DIR}/Utilities/Release/${script}
|
||||
${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=nightly -P ${CMake_SOURCE_DIR}/Utilities/Release/${script}
|
||||
${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake
|
||||
")
|
||||
ADD_TEST(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh)
|
||||
|
||||
@@ -34,7 +34,7 @@ if(NOT DEFINED CVS_COMMAND)
|
||||
set(CVS_COMMAND cvs)
|
||||
endif(NOT DEFINED CVS_COMMAND)
|
||||
|
||||
if(${CMAKE_CREATE_VERSION} MATCHES "^(release|maint|next)$")
|
||||
if(${CMAKE_CREATE_VERSION} MATCHES "^(release|maint|next|nightly)$")
|
||||
set(GIT_BRANCH origin/${CMAKE_CREATE_VERSION})
|
||||
else()
|
||||
set(GIT_BRANCH ${CMAKE_CREATE_VERSION})
|
||||
|
||||
Reference in New Issue
Block a user