diff options
author | Brad King <brad.king@kitware.com> | 2022-02-03 14:16:07 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2022-02-03 14:16:07 (GMT) |
commit | 345908b16b6279c5c67ac00760379e06f2efe40a (patch) | |
tree | a923c7292d68a56f11ec88f696c94db15dd0b1df | |
parent | 21fc4aee5d88a4803f6028ac4dc0f19b93abfa9b (diff) | |
download | CMake-345908b16b6279c5c67ac00760379e06f2efe40a.zip CMake-345908b16b6279c5c67ac00760379e06f2efe40a.tar.gz CMake-345908b16b6279c5c67ac00760379e06f2efe40a.tar.bz2 |
Begin post-3.23 development
-rw-r--r-- | .gitlab-ci.yml | 14 | ||||
-rw-r--r-- | Help/release/dev/0-sample-topic.rst | 7 | ||||
-rw-r--r-- | Help/release/index.rst | 2 | ||||
-rw-r--r-- | Source/CMakeVersion.cmake | 4 |
4 files changed, 18 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08fc107..d8d3a36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ p:doc-package: - .cmake_doc_artifacts - .run_only_for_package -.u:source-package: +u:source-package: extends: - .rsync_upload_binary - .run_only_for_package @@ -77,7 +77,7 @@ b:help:master: - .cmake_org_help - .run_only_for_continuous_master -.u:help:master: +u:help:master: extends: - .rsync_upload_help - .run_only_for_continuous_master @@ -93,7 +93,7 @@ b:help:stage: - .cmake_org_help - .run_only_for_continuous_stage -.u:help:stage: +u:help:stage: extends: - .rsync_upload_help - .run_only_for_continuous_stage @@ -529,7 +529,7 @@ b:linux-x86_64-package: needs: - p:doc-package -.u:linux-x86_64-package: +u:linux-x86_64-package: extends: - .rsync_upload_binary - .run_only_for_package @@ -553,7 +553,7 @@ b:linux-aarch64-package: needs: - p:doc-package -.u:linux-aarch64-package: +u:linux-aarch64-package: extends: - .rsync_upload_binary - .run_only_for_package @@ -694,7 +694,7 @@ b:macos-package: needs: - p:doc-package -.u:macos-package: +u:macos-package: extends: - .rsync_upload_binary - .run_only_for_package @@ -717,7 +717,7 @@ b:macos10.10-package: needs: - p:doc-package -.u:macos10.10-package: +u: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 new file mode 100644 index 0000000..e4cc01e --- /dev/null +++ b/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. diff --git a/Help/release/index.rst b/Help/release/index.rst index ee677a3..ad33705 100644 --- a/Help/release/index.rst +++ b/Help/release/index.rst @@ -7,6 +7,8 @@ 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 c599863..6e9687f 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 23) -set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 0) +set(CMake_VERSION_PATCH 20220203) +#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. |