From 321da921ac828a7f1547a7550649c2619f41de7b Mon Sep 17 00:00:00 2001 From: jamesgao-jpg Date: Thu, 23 Apr 2026 07:00:59 +0000 Subject: [PATCH] bump: cardinal pins to v2.5.105 (v1) and v3.0.1 (v2) Both CARDINAL_VERSION pins were stuck at tags cut before the KNOHWERE_DECLARE_CONFIG -> KNOWHERE_DECLARE_CONFIG rename done in knowhere PR #1577 (commit c884fd87) and the corresponding cardinal fixes: - cardinalv1 pin v2.5.104 -> v2.5.105: includes zilliztech/cardinal#824 and #825 (rename on the v1 branch). - cardinalv2 pin v3.0.0 -> v3.0.1: includes zilliztech/cardinal#823 (rename on master). v3.0.1 also pulls in zilliztech/cardinal#809 (Migrate to Conan 2.x), which is already the case on knowhere main since #1495. Without this bump every WITH_CARDINAL=ON build (knowhere/nightly-2.0 x86 and knowhere/cardinal e2e (arm)) fails to compile with: cardinalv{1,2}/know/cardinal_config.h:33:5: error: ISO C++ forbids declaration of 'KNOHWERE_DECLARE_CONFIG' with no type These two new tags were cut from the post-fix tips of the v1 and master branches in cardinal. Signed-off-by: jamesgao-jpg --- cmake/libs/cardinal/v1/CMakeLists.txt | 2 +- cmake/libs/cardinal/v2/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/libs/cardinal/v1/CMakeLists.txt b/cmake/libs/cardinal/v1/CMakeLists.txt index 4f2a6384a..c59aa4fae 100644 --- a/cmake/libs/cardinal/v1/CMakeLists.txt +++ b/cmake/libs/cardinal/v1/CMakeLists.txt @@ -3,7 +3,7 @@ project(knowhere CXX C) # Use short SHA1 as version # v2.5 tag is used for cardinal v1 -set(CARDINAL_VERSION v2.5.104) +set(CARDINAL_VERSION v2.5.105) set(CARDINAL_REPO_URL "https://github.com/zilliztech/cardinal.git") set(CARDINAL_ROOT "${KNOWHERE_THRID_ROOT}/cardinalv1") diff --git a/cmake/libs/cardinal/v2/CMakeLists.txt b/cmake/libs/cardinal/v2/CMakeLists.txt index 9b1b12a8b..c1a8f8c38 100644 --- a/cmake/libs/cardinal/v2/CMakeLists.txt +++ b/cmake/libs/cardinal/v2/CMakeLists.txt @@ -3,7 +3,7 @@ project(knowhere CXX C) # Use short SHA1 as version # v2.6 tag is used for cardinal v2 -set(CARDINAL_VERSION v3.0.0) +set(CARDINAL_VERSION v3.0.1) set(CARDINAL_REPO_URL "https://github.com/zilliztech/cardinal.git") set(CARDINAL_ROOT "${KNOWHERE_THRID_ROOT}/cardinalv2")