From b16eb7c76dbd98c84d84726aba346aac670ee488 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 8 Oct 2020 11:21:44 -0400 Subject: Help: Drop development topic notes to prepare release Release versions do not have the development topic section of the CMake Release Notes index page. --- Help/release/dev/0-sample-topic.rst | 7 ------- Help/release/index.rst | 2 -- 2 files changed, 9 deletions(-) delete mode 100644 Help/release/dev/0-sample-topic.rst 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 a8329a6..6fb0f1a 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 ======== -- cgit v0.12 From 16324555ab279fcd9dc754c222f0f8f1ad75484f Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 8 Oct 2020 11:22:56 -0400 Subject: gitlab-ci: Drop package pipeline upload jobs for release branch The package pipeline for release versions should not upload packages automatically to our archive of nightly development versions. --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a94a3d..eda96ae 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 -- cgit v0.12 From 302b00a2628860eeac59688795db337b8b7984c1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 8 Oct 2020 11:23:38 -0400 Subject: Begin 3.19 release versioning --- Source/CMakeVersion.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 8d4d1c2..8c36e7a 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 18) -set(CMake_VERSION_PATCH 20201008) -#set(CMake_VERSION_RC 0) +set(CMake_VERSION_MINOR 19) +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. -- cgit v0.12