Re: [cmake-developers] [ANNOUNCE] CMake merge process transition
On 03/03/2017 01:49 PM, Brad King wrote: > For now the nightly builds will continue to work as before, fetching > from the cmake.org repository. The `master`, `nightly-master`, `next`, > and `nightly` branches there are now all maintained by a robot that > mirrors the equivalent new refs in the gitlab repository. I have some > CTest script updates to move clients to following the gitlab repository > directly and will work on deploying them soon. I have updated the cmake_common.cmake script to make nightly testing builds follow the gitlab repository branches directly. I've converted Kitware-maintained builds over to them. I'd like to get all testing machines converted away from the cmake.org repository branches. Then we can stop mirroring to the old `nightly-master`, `nightly`, and `next` branches. If you are running a nightly build, please see updated instructions [1]. Basically the old "dashboard" branch is now published in a new repo [2]. The updated cmake_common.cmake script will automatically convert existing source trees to the new repository and branch layout. Thanks, -Brad [1] https://gitlab.kitware.com/cmake/cmake/blob/master/Help/dev/testing.rst [2] https://gitlab.kitware.com/cmake/dashboard-scripts -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [ANNOUNCE] CMake merge process transition
On 03/02/2017 03:55 PM, Brad King wrote: > Once we have actually made the final transition I'll merge the new > instructions and post a link here to their final URL. The transition is complete! Documentation of the review process is now rendered directly on the gitlab repo page [1]. The canonical entry point for contributors is still the CONTRIBUTING.rst file [2]. There is also a new place to index developer documentation [3]. [1] https://gitlab.kitware.com/cmake/cmake/blob/master/Help/dev/review.rst [2] https://gitlab.kitware.com/cmake/cmake/blob/master/CONTRIBUTING.rst [3] https://gitlab.kitware.com/cmake/cmake/blob/master/Help/dev/README.rst CONTRIBUTING.rst now suggests running `Utilities/SetupForDevelopment.sh`. This script has been updated [4] to drop the old configuration of ssh access to cmake.org repositories. It is now suitable for all contributors to run. [4] https://gitlab.kitware.com/cmake/cmake/merge_requests/546 > Furthermore, the staging branch will not be published as an official > branch under refs/heads/ on the gitlab.kitware.com/cmake/cmake repo. > Instead it will be in a custom refs/ path that Git does not clone or > fetch by default. CTest scripts used to drive nightly testing will > need to be adapted for this. I'll post more information for those of > you running nightly builds once we are ready to update the clients. For now the nightly builds will continue to work as before, fetching from the cmake.org repository. The `master`, `nightly-master`, `next`, and `nightly` branches there are now all maintained by a robot that mirrors the equivalent new refs in the gitlab repository. I have some CTest script updates to move clients to following the gitlab repository directly and will work on deploying them soon. -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [ANNOUNCE] CMake merge process transition
Hi Folks, We're moving CMake's process for merging changes to new infrastructure that is managed directly within merge requests on gitlab.kitware.com. Summary --- The new process for reviewing changes, staging them for nightly testing, and eventually merging to `master` is documented in a new `Help/dev/review.rst` file. This document is drafted here: https://gitlab.kitware.com/cmake/cmake/merge_requests/542 Please take a look at the draft. Once we have actually made the final transition I'll merge the new instructions and post a link here to their final URL. Details --- The rest of this message is primarily meant for those who had push access to the old staging repository and/or run nightly builds. Our contribution and review process currently works through GitLab merge requests. However, the actual merge to `next` or `master` has still been done by manually pushing topic branches to our old staging repository (cmake.org/stage/cmake.git) and commanding merge scripts via ssh. Our process for staging topics in `next` for the nightly builds has worked well but requires tedious manual steps and makes updating a topic with a fixup commit difficult. We will drop `next` and replace it with an automatically-maintained staging branch. We currently have a bot that listens to GitLab merge request activity and responds to commands like `Do: test` for topic testing. The bot is capable of much more. It will soon be configured to respond to `Do: stage` and `Do: unstage` commands that instruct it to add or remove the branch associated with a MR to/from the staging branch used for nightly testing. The staging branch is always built from `master` plus a set of staged MR topics. When `master` is updated the entire staging branch is rebuilt automatically. When a staged MR is updated it is unstaged automatically awaiting review and a new `Do: stage`. This will hugely simplify the process of staging a MR for nightly testing. Furthermore, the staging branch will not be published as an official branch under refs/heads/ on the gitlab.kitware.com/cmake/cmake repo. Instead it will be in a custom refs/ path that Git does not clone or fetch by default. CTest scripts used to drive nightly testing will need to be adapted for this. I'll post more information for those of you running nightly builds once we are ready to update the clients. The bot will also gain a `Do: merge` command that I'll use to perform the actual merges to `master`. Its merge commit messages will have more information than the current ones, and will refer back to the MRs that created them. -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
