Merge branch 'release-3.21'

4 files changed, 10 insertions, 19 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d224088..bbed2e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ prep:doc-package:
         - .cmake_doc_artifacts
         - .run_only_for_package
 
-upload:source-package:
+.upload:source-package:
     extends:
         - .rsync_upload_binary
         - .run_only_for_package
@@ -70,7 +70,7 @@ build:help:master:
         - .cmake_org_help
         - .run_only_for_continuous_master
 
-upload:help:master:
+.upload:help:master:
     extends:
         - .rsync_upload_help
         - .run_only_for_continuous_master
@@ -86,7 +86,7 @@ build:help:stage:
         - .cmake_org_help
         - .run_only_for_continuous_stage
 
-upload:help:stage:
+.upload:help:stage:
     extends:
         - .rsync_upload_help
         - .run_only_for_continuous_stage
@@ -495,7 +495,7 @@ build:linux-x86_64-package:
     needs:
         - prep:doc-package
 
-upload:linux-x86_64-package:
+.upload:linux-x86_64-package:
     extends:
         - .rsync_upload_binary
         - .run_only_for_package
@@ -519,7 +519,7 @@ build:linux-aarch64-package:
     needs:
         - prep:doc-package
 
-upload:linux-aarch64-package:
+.upload:linux-aarch64-package:
     extends:
         - .rsync_upload_binary
         - .run_only_for_package
@@ -656,7 +656,7 @@ build:macos-package:
     needs:
         - prep:doc-package
 
-upload:macos-package:
+.upload:macos-package:
     extends:
         - .rsync_upload_binary
         - .run_only_for_package
@@ -679,7 +679,7 @@ build:macos10.10-package:
     needs:
         - prep:doc-package
 
-upload:macos10.10-package:
+.upload:macos10.10-package:
     extends:
         - .rsync_upload_binary
         - .run_only_for_package
diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst
deleted file mode 100644
index e4cc01e..0000000
--- a/Help/release/dev/0-sample-topic.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-0-sample-topic
---------------
-
-* This is a sample release note for the change in a topic.
-  Developers should add similar notes for each topic branch
-  making a noteworthy change.  Each document should be named
-  and titled to match the topic name to avoid merge conflicts.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index 5938878..75667e5 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -7,8 +7,6 @@ CMake Release Notes
   This file should include the adjacent "dev.txt" file
   in development versions but not in release versions.
 
-.. include:: dev.txt
-
 Releases
 ========
 
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 46e94f1..ad174a7 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,8 +1,8 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
-set(CMake_VERSION_MINOR 20)
-set(CMake_VERSION_PATCH 20210617)
-#set(CMake_VERSION_RC 0)
+set(CMake_VERSION_MINOR 21)
+set(CMake_VERSION_PATCH 0)
+set(CMake_VERSION_RC 0)
 set(CMake_VERSION_IS_DIRTY 0)
 
 # Start with the full version number used in tags.  It has no dev info.