This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via e6cd443763d90583d1664403619979b4bce44393 (commit)
via 9a1ee04dd5b7da3bda7159500b3eeda16ee86fb0 (commit)
from fddee0f94de26cd9540becfca7ad81716023f767 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6cd443763d90583d1664403619979b4bce44393
commit e6cd443763d90583d1664403619979b4bce44393
Merge: fddee0f 9a1ee04
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 3 20:05:37 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Mar 3 15:05:39 2017 -0500
Stage topic 'binaries-from-gitlab-repo'
Topic-id: 22863
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/547
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a1ee04dd5b7da3bda7159500b3eeda16ee86fb0
commit 9a1ee04dd5b7da3bda7159500b3eeda16ee86fb0
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 3 14:34:58 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Mar 3 15:03:00 2017 -0500
Utilities/Release: Fetch from gitlab.kitware.com repository
Update our release scripts to fetch from the gitlab.kitware.com
repository instead of the cmake.org repository. Revise our
mapping of special branch names to account for the refs that
now store them in the new repository.
diff --git a/Utilities/Release/release_cmake.cmake
b/Utilities/Release/release_cmake.cmake
index 0db89b5..ee1a0dc 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -32,9 +32,15 @@ if(NOT DEFINED GIT_COMMAND)
set(GIT_COMMAND git)
endif()
-if(${CMAKE_CREATE_VERSION} MATCHES "^(release|maint|next|nightly)$")
+if(CMAKE_CREATE_VERSION MATCHES "^(master|release)$")
+ set(GIT_FETCH "")
set(GIT_BRANCH origin/${CMAKE_CREATE_VERSION})
+elseif(CMAKE_CREATE_VERSION STREQUAL "nightly")
+ set(nightly stage/master/nightly/latest)
+ set(GIT_FETCH "${GIT_COMMAND} fetch origin
refs/${nightly}:refs/remotes/origin/${nightly}")
+ set(GIT_BRANCH origin/${nightly})
else()
+ set(GIT_FETCH "")
set(GIT_BRANCH ${CMAKE_CREATE_VERSION})
endif()
diff --git a/Utilities/Release/release_cmake.sh.in
b/Utilities/Release/release_cmake.sh.in
index 1465129..f363b3d 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -94,13 +94,15 @@ cd @CMAKE_RELEASE_DIRECTORY@
if [ ! -z "@GIT_COMMAND@" ]; then
# clone the repo without creating any source files in the directory
# matching the branch being built (i.e. master CMake-2-8, etc)
- @GIT_COMMAND@ clone -n git://cmake.org/cmake.git @CMAKE_CREATE_VERSION@
- check_exit_value $? "Checkout git cmake source" || exit 1
+ @GIT_COMMAND@ clone -n https://gitlab.kitware.com/cmake/cmake.git
@CMAKE_CREATE_VERSION@
+ check_exit_value $? "git clone cmake source" || exit 1
# go into the git directory
cd @CMAKE_CREATE_VERSION@
# run any extra commands if they exist
@GIT_EXTRA@
check_exit_value $? "git extra cmake source" || exit 1
+ @GIT_FETCH@
+ check_exit_value $? "git extra fetch" || exit 1
# now checkout a copy on the local branch working
@GIT_COMMAND@ checkout -b working @GIT_BRANCH@
check_exit_value $? "git checkout" || exit 1
-----------------------------------------------------------------------
Summary of changes:
Utilities/Release/release_cmake.cmake | 8 +++++++-
Utilities/Release/release_cmake.sh.in | 6 ++++--
2 files changed, 11 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
