v2.2.15

Signed-off-by: Ji Bin <[email protected]>

.github/workflows/main.yml

@@ -153,7 +153,7 @@ jobs:
           key: windows-ccache-${{ hashFiles('milvus_binary/env.sh') }}
           restore-keys: windows-ccache-
       - name: Configure Toolchain
-        uses: msys2/setup-msys2@v2.17.0
+        uses: msys2/setup-msys2@v2.21.0
         with:
           msystem: mingw64
       - name: Prepare

milvus_binary/env.sh

@@ -1,5 +1,5 @@
 
 MILVUS_REPO="https://github.com/milvus-io/milvus.git"
-MILVUS_VERSION="v2.2.14"
+MILVUS_VERSION="v2.2.15"
 BUILD_PROXY=
 BUILD_FORCE=NO

milvus_binary/patches/knowhere-v1.3.19.patch

@@ -0,0 +1,52 @@
+From 578938ec360c91c97716bbd301c8886c0bb814c7 Mon Sep 17 00:00:00 2001
+From: Ji Bin <[email protected]>
+Date: Thu, 23 Nov 2023 10:26:22 +0800
+Subject: [PATCH] patch for v1.3.19
+
+Signed-off-by: Ji Bin <[email protected]>
+---
+ CMakeLists.txt                    | 8 --------
+ knowhere/archive/KnowhereConfig.h | 1 +
+ 2 files changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 36f7332..6cb7e8b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,13 +27,6 @@ add_definitions( -DAUTO_INITIALIZE_EASYLOGGINGPP )
+ if ( APPLE )
+     set ( CMAKE_CROSSCOMPILING TRUE )
+     set ( RUN_HAVE_GNU_POSIX_REGEX 0 )
+-    if ( DEFINED ENV{HOMEBREW_PREFIX} )
+-        set( APPLE_LLVM_PREFIX $ENV{HOMEBREW_PREFIX} )
+-    else()
+-        set( APPLE_LLVM_PREFIX "/usr/local" )
+-    endif()
+-    set ( CMAKE_C_COMPILER "${APPLE_LLVM_PREFIX}/opt/llvm/bin/clang" )
+-    set ( CMAKE_CXX_COMPILER "${APPLE_LLVM_PREFIX}/opt/llvm/bin/clang++" )
+ endif ()
+
+ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" )
+@@ -80,7 +73,6 @@ include( CheckCXXCompilerFlag )
+ if ( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
+     message(STATUS "MacOS")
+     set ( MACOS TRUE )
+-    set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${APPLE_LLVM_PREFIX}/opt/libomp/lib" )
+ elseif ( "${CMAKE_SYSTEM}" MATCHES "Linux" )
+     message( STATUS "Linux")
+     set ( LINUX TRUE )
+diff --git a/knowhere/archive/KnowhereConfig.h b/knowhere/archive/KnowhereConfig.h
+index f83bb94..f794e8b 100644
+--- a/knowhere/archive/KnowhereConfig.h
++++ b/knowhere/archive/KnowhereConfig.h
+@@ -11,6 +11,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <vector>
+ #include <string>
+
+-- 
+2.42.1
+