From fc901bc91d8b891a8fcfc6f64e4024f6907161df Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 10 Feb 2021 08:25:37 -0500 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 5dfca05..95b41fb 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 809b1149798f17f4c0d403e94a8ab3f1530da142 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 10 Feb 2021 08:26:15 -0500 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 672df5a..a322aa6 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 @@ -199,7 +199,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 @@ -223,7 +223,7 @@ build:linux-aarch64-package: needs: - prep:doc-package -upload:linux-aarch64-package: +.upload:linux-aarch64-package: extends: - .rsync_upload - .run_only_for_package @@ -298,7 +298,7 @@ build:macos-package: needs: - prep:doc-package -upload:macos-package: +.upload:macos-package: extends: - .rsync_upload - .run_only_for_package @@ -321,7 +321,7 @@ build:macos10.10-package: needs: - prep:doc-package -upload:macos10.10-package: +.upload:macos10.10-package: extends: - .rsync_upload - .run_only_for_package -- cgit v0.12 From f388ce53210d983dc99547b135e839487792bcb1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 10 Feb 2021 08:27:12 -0500 Subject: Begin 3.20 release versioning --- Source/CMakeVersion.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f7a15c2..d32de37 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 20210210) -#set(CMake_VERSION_RC 0) +set(CMake_VERSION_MINOR 20) +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