diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-08 15:28:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-10-08 15:28:48 (GMT) |
| commit | 0cd84434ace8bc0c26bd6d0d4c9bb04cc53f1c8a (patch) | |
| tree | 4a3cec437a47ac490b4bc39ef949f87165ed5240 | |
| parent | 5d1755fab1fdc9b00da926d35749151ac8985804 (diff) | |
| download | CMake-0cd84434ace8bc0c26bd6d0d4c9bb04cc53f1c8a.zip CMake-0cd84434ace8bc0c26bd6d0d4c9bb04cc53f1c8a.tar.gz CMake-0cd84434ace8bc0c26bd6d0d4c9bb04cc53f1c8a.tar.bz2 | |
Begin post-3.19 development
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -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, 14 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eda96ae..1a94a3d 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 - .run_only_for_package @@ -175,7 +175,7 @@ build:linux-x86_64-package: needs: - prep:doc-package -.upload:linux-x86_64-package: +upload:linux-x86_64-package: extends: - .rsync_upload - .run_only_for_package @@ -250,7 +250,7 @@ build:macos-package: needs: - prep:doc-package -.upload:macos-package: +upload:macos-package: extends: - .rsync_upload - .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 6fb0f1a..a8329a6 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 8c36e7a..de3f450 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 19) -set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 0) +set(CMake_VERSION_PATCH 20201008) +#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. |