From 1b9c911310c7d5aa56d55ca6dac7917a13adc9c4 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 20 Sep 2021 08:37:51 -0400 Subject: [PATCH] Make sure we keep the rapids-cmake and rmm cal version in sync when we make a new rmm version, we need to also bump the rapids-cmake version at the same time. Otherwise we will get the previous releases dependencies by mistake. --- CMakeLists.txt | 2 +- ci/release/update-version.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37bf49ba6..4bf884542 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR) -file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-21.10/RAPIDS.cmake +file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-21.12/RAPIDS.cmake ${CMAKE_BINARY_DIR}/RAPIDS.cmake) include(${CMAKE_BINARY_DIR}/RAPIDS.cmake) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 7338a70c1..bf31c981a 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -30,10 +30,11 @@ function sed_runner() { } sed_runner 's/'" VERSION .*"'/'" VERSION ${NEXT_FULL_TAG}"'/g' CMakeLists.txt +sed_runner 's/'"branch-.*\/RAPIDS.cmake"'/'"branch-${NEXT_SHORT_TAG}\/RAPIDS.cmake"'/g' CMakeLists.txt sed_runner 's/version=.*/version=\"'"${NEXT_FULL_TAG}"'\",/g' python/setup.py sed_runner 's/'"PROJECT_NUMBER = .*"'/'"PROJECT_NUMBER = ${NEXT_SHORT_TAG}"'/g' doxygen/Doxyfile sed_runner 's/'"version =.*"'/'"version = \"${NEXT_SHORT_TAG}\""'/g' python/docs/conf.py -sed_runner 's/'"release =.*"'/'"release = \"${NEXT_FULL_TAG}\""'/g' python/docs/conf.py \ No newline at end of file +sed_runner 's/'"release =.*"'/'"release = \"${NEXT_FULL_TAG}\""'/g' python/docs/conf.py