diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-03 14:14:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-02-03 14:14:00 (GMT) |
| commit | 21fc4aee5d88a4803f6028ac4dc0f19b93abfa9b (patch) | |
| tree | ee0506f02127c744f6714e466159bf6b07c7324b | |
| parent | 3d85c0072db6e97938b9fe7157483bcd41918b08 (diff) | |
| parent | 736663deed91a383d6f60ea0994c3f4de394e7b0 (diff) | |
| download | CMake-21fc4aee5d88a4803f6028ac4dc0f19b93abfa9b.zip CMake-21fc4aee5d88a4803f6028ac4dc0f19b93abfa9b.tar.gz CMake-21fc4aee5d88a4803f6028ac4dc0f19b93abfa9b.tar.bz2 | |
Merge branch 'release-3.23'
| -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 | 6 |
4 files changed, 10 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d8d3a36..08fc107 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 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 ad33705..ee677a3 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 3fc3a66..c599863 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 22) -set(CMake_VERSION_PATCH 20220203) -#set(CMake_VERSION_RC 0) +set(CMake_VERSION_MINOR 23) +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. |