From 7ada881cf67b61566643e0fd725e45e6cb37222a Mon Sep 17 00:00:00 2001 From: Michael Demoret <42954918+mdemoret-nv@users.noreply.github.com> Date: Fri, 14 Jul 2023 17:37:30 -0400 Subject: [PATCH] Update Versions for v23.11.00 (#357) This PR contains the changes from running the `ci/release/update-version.sh` script for a new release Authors: - Michael Demoret (https://github.com/mdemoret-nv) Approvers: - David Gardner (https://github.com/dagardner-nv) URL: https://github.com/nv-morpheus/MRC/pull/357 --- .gitmodules | 2 +- CMakeLists.txt | 2 +- ci/release/pr_code_freeze_template.md | 11 +++++++++++ ci/release/update-version.sh | 1 + docs/quickstart/CMakeLists.txt | 2 +- docs/quickstart/environment_cpp.yml | 2 +- external/utilities | 2 +- 7 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 ci/release/pr_code_freeze_template.md diff --git a/.gitmodules b/.gitmodules index 76d78c90c..0180e5c60 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "morpheus_utils"] path = external/utilities url = https://github.com/nv-morpheus/utilities.git - branch = branch-23.07 + branch = branch-23.11 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f0f92c91..bb766bd56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ morpheus_utils_initialize_package_manager( morpheus_utils_initialize_cuda_arch(mrc) project(mrc - VERSION 23.07.00 + VERSION 23.11.00 LANGUAGES C CXX ) diff --git a/ci/release/pr_code_freeze_template.md b/ci/release/pr_code_freeze_template.md new file mode 100644 index 000000000..99642f7c9 --- /dev/null +++ b/ci/release/pr_code_freeze_template.md @@ -0,0 +1,11 @@ +## :snowflake: Code freeze for `branch-${VERSION}` and `v${VERSION}` release + +### What does this mean? +Only critical/hotfix level issues should be merged into `branch-${VERSION}` until release (merging of this PR). + +All other development PRs should be retargeted towards the next release branch: `branch-${NEXT_VERSION}`. + +### What is the purpose of this PR? +- Update documentation +- Allow testing for the new release +- Enable a means to merge `branch-${VERSION}` into `main` for the release diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 8e4895f23..de1318c0c 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -60,6 +60,7 @@ function sed_runner() { # .gitmodules git submodule set-branch -b branch-${NEXT_SHORT_TAG} morpheus_utils +git submodule update --remote # Root CMakeLists.txt sed_runner 's/'"VERSION ${CURRENT_FULL_VERSION}.*"'/'"VERSION ${NEXT_FULL_VERSION}"'/g' CMakeLists.txt diff --git a/docs/quickstart/CMakeLists.txt b/docs/quickstart/CMakeLists.txt index 1b87c4b87..3a6766c35 100644 --- a/docs/quickstart/CMakeLists.txt +++ b/docs/quickstart/CMakeLists.txt @@ -28,7 +28,7 @@ list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../external/utili include(morpheus_utils/load) project(mrc-quickstart - VERSION 23.07.00 + VERSION 23.11.00 LANGUAGES C CXX ) diff --git a/docs/quickstart/environment_cpp.yml b/docs/quickstart/environment_cpp.yml index 379bf6477..775ab13ad 100644 --- a/docs/quickstart/environment_cpp.yml +++ b/docs/quickstart/environment_cpp.yml @@ -30,7 +30,7 @@ dependencies: - pkg-config=0.29 - python=3.10 - scikit-build>=0.12 - - mrc=23.07 + - mrc=23.11 - sysroot_linux-64=2.17 - pip: - cython diff --git a/external/utilities b/external/utilities index a5b9689e3..899a46063 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit a5b9689e3a82fe5b49245b0a02c907ea70aed7b8 +Subproject commit 899a4606388b6ad2e94662949cd65df8e8c9bdd0