Browse Source

Begin post-3.22 development

Brad King 4 years ago
parent
commit
3068ea834f
4 changed files with 18 additions and 9 deletions
  1. 7 7
      .gitlab-ci.yml
  2. 7 0
      Help/release/dev/0-sample-topic.rst
  3. 2 0
      Help/release/index.rst
  4. 2 2
      Source/CMakeVersion.cmake

+ 7 - 7
.gitlab-ci.yml

@@ -52,7 +52,7 @@ prep:doc-package:
         - .cmake_doc_artifacts
         - .cmake_doc_artifacts
         - .run_only_for_package
         - .run_only_for_package
 
 
-.upload:source-package:
+upload:source-package:
     extends:
     extends:
         - .rsync_upload_binary
         - .rsync_upload_binary
         - .run_only_for_package
         - .run_only_for_package
@@ -70,7 +70,7 @@ build:help:master:
         - .cmake_org_help
         - .cmake_org_help
         - .run_only_for_continuous_master
         - .run_only_for_continuous_master
 
 
-.upload:help:master:
+upload:help:master:
     extends:
     extends:
         - .rsync_upload_help
         - .rsync_upload_help
         - .run_only_for_continuous_master
         - .run_only_for_continuous_master
@@ -86,7 +86,7 @@ build:help:stage:
         - .cmake_org_help
         - .cmake_org_help
         - .run_only_for_continuous_stage
         - .run_only_for_continuous_stage
 
 
-.upload:help:stage:
+upload:help:stage:
     extends:
     extends:
         - .rsync_upload_help
         - .rsync_upload_help
         - .run_only_for_continuous_stage
         - .run_only_for_continuous_stage
@@ -522,7 +522,7 @@ build:linux-x86_64-package:
     needs:
     needs:
         - prep:doc-package
         - prep:doc-package
 
 
-.upload:linux-x86_64-package:
+upload:linux-x86_64-package:
     extends:
     extends:
         - .rsync_upload_binary
         - .rsync_upload_binary
         - .run_only_for_package
         - .run_only_for_package
@@ -546,7 +546,7 @@ build:linux-aarch64-package:
     needs:
     needs:
         - prep:doc-package
         - prep:doc-package
 
 
-.upload:linux-aarch64-package:
+upload:linux-aarch64-package:
     extends:
     extends:
         - .rsync_upload_binary
         - .rsync_upload_binary
         - .run_only_for_package
         - .run_only_for_package
@@ -687,7 +687,7 @@ build:macos-package:
     needs:
     needs:
         - prep:doc-package
         - prep:doc-package
 
 
-.upload:macos-package:
+upload:macos-package:
     extends:
     extends:
         - .rsync_upload_binary
         - .rsync_upload_binary
         - .run_only_for_package
         - .run_only_for_package
@@ -710,7 +710,7 @@ build:macos10.10-package:
     needs:
     needs:
         - prep:doc-package
         - prep:doc-package
 
 
-.upload:macos10.10-package:
+upload:macos10.10-package:
     extends:
     extends:
         - .rsync_upload_binary
         - .rsync_upload_binary
         - .run_only_for_package
         - .run_only_for_package

+ 7 - 0
Help/release/dev/0-sample-topic.rst

@@ -0,0 +1,7 @@
+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.

+ 2 - 0
Help/release/index.rst

@@ -7,6 +7,8 @@ CMake Release Notes
   This file should include the adjacent "dev.txt" file
   This file should include the adjacent "dev.txt" file
   in development versions but not in release versions.
   in development versions but not in release versions.
 
 
+.. include:: dev.txt
+
 Releases
 Releases
 ========
 ========
 
 

+ 2 - 2
Source/CMakeVersion.cmake

@@ -1,8 +1,8 @@
 # CMake version number components.
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 22)
 set(CMake_VERSION_MINOR 22)
-set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 0)
+set(CMake_VERSION_PATCH 20211008)
+#set(CMake_VERSION_RC 0)
 set(CMake_VERSION_IS_DIRTY 0)
 set(CMake_VERSION_IS_DIRTY 0)
 
 
 # Start with the full version number used in tags.  It has no dev info.
 # Start with the full version number used in tags.  It has no dev info.