summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-11-23 15:13:23 (GMT)
committerBrad King <brad.king@kitware.com>2021-11-23 15:13:23 (GMT)
commit580e20d0d4b03e14c47a5aca09a13a6cf10e0eb4 (patch)
treebf4830b33425e920dc4fce5f17bd4d2a60635b3e
parent501766ff4e1d5c5e43486c6a6c0db61f27a9a90c (diff)
parent7d5828e2933182e4bcd03fd32ad5cc4403b93694 (diff)
downloadCMake-580e20d0d4b03e14c47a5aca09a13a6cf10e0eb4.zip
CMake-580e20d0d4b03e14c47a5aca09a13a6cf10e0eb4.tar.gz
CMake-580e20d0d4b03e14c47a5aca09a13a6cf10e0eb4.tar.bz2
Merge branch 'backport-ci-rename-jobs' into ci-rename-jobs
-rw-r--r--Help/dev/maint.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst
index 664b7a4..54d627d 100644
--- a/Help/dev/maint.rst
+++ b/Help/dev/maint.rst
@@ -245,12 +245,12 @@ Commit with a message such as::
Release versions do not have the development topic section of
the CMake Release Notes index page.
-Update ``.gitlab-ci.yml`` to drop the ``upload:`` jobs from the
+Update ``.gitlab-ci.yml`` to drop the upload jobs from the
packaging pipeline by renaming them to start in ``.``:
.. code-block:: shell
- sed -i 's/^upload:/.upload:/' .gitlab-ci.yml
+ sed -i 's/^u:/.u:/' .gitlab-ci.yml
Commit with a message such as::
@@ -298,7 +298,7 @@ the version date from ``origin/master``:
git checkout origin/master -- \
Source/CMakeVersion.cmake Help/release/dev/0-sample-topic.rst
sed -i $'/^Releases/ i\\\n.. include:: dev.txt\\\n' Help/release/index.rst
- sed -i 's/^\.upload:/upload:/' .gitlab-ci.yml
+ sed -i 's/^\.u:/u:/' .gitlab-ci.yml
Update ``Source/CMakeVersion.cmake`` to set the version to
``$major.$minor.$date``: