Force to checkout everytime unless env var set (#520)

Signed-off-by: Patrick Weizhi Xu <[email protected]>

cmake/libs/libcardinal.cmake

@@ -1,4 +1,5 @@
-set(CARDINAL_VERSION 0bb6d5771a7c279362bd3b6ea7dc94b53d0c4de1 )
+# Use short SHA1 as version
+set(CARDINAL_VERSION 0bb6d57)
 set(CARDINAL_REPO_URL "https://github.com/zilliztech/cardinal.git")
 
 set(CARDINAL_REPO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cardinal")
@@ -12,19 +13,40 @@ if(NOT EXISTS "${CARDINAL_REPO_DIR}/.git")
  OUTPUT_VARIABLE CARDINAL_CLONE_OUTPUT
  ERROR_VARIABLE CARDINAL_CLONE_ERROR
  OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
+
  if(NOT CARDINAL_CLONE_RESULT EQUAL "0")
  message(FATAL_ERROR "Failed to clone cardinal: ${CARDINAL_CLONE_ERROR}")
- else()
- execute_process(
- COMMAND git -C ${CARDINAL_REPO_DIR} checkout ${CARDINAL_VERSION}
- RESULT_VARIABLE CARDINAL_CHECKOUT_RESULT
- OUTPUT_VARIABLE CARDINAL_CHECKOUT_OUTPUT
- ERROR_VARIABLE CARDINAL_CHECKOUT_ERROR
- OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
- if(NOT CARDINAL_CHECKOUT_RESULT EQUAL "0")
- message(
- FATAL_ERROR "Failed to checkout cardinal: ${CARDINAL_CHECKOUT_ERROR}")
- endif()
+ endif()
+endif()
+
+# Always checkout the version specified as `CARDINAL_VERSION` unless `CARDINAL_SKIP_CHECKOUT` is set
+if(NOT $ENV{CARDINAL_SKIP_CHECKOUT})
+ message(STATUS "Checking out cardinal version ${CARDINAL_VERSION}")
+
+ execute_process(
+ COMMAND git -C ${CARDINAL_REPO_DIR} fetch
+ RESULT_VARIABLE CARDINAL_FETCH_RESULT
+ OUTPUT_VARIABLE CARDINAL_FETCH_OUTPUT
+ ERROR_VARIABLE CARDINAL_FETCH_ERROR
+ OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
+
+ if(NOT CARDINAL_FETCH_RESULT EQUAL "0")
+ message(
+ FATAL_ERROR "Failed to fetch cardinal: ${CARDINAL_FETCH_ERROR}")
+ endif()
+
+ message(STATUS "Fetched cardinal ${CARDINAL_FETCH_OUTPUT}")
+
+ execute_process(
+ COMMAND git -C ${CARDINAL_REPO_DIR} checkout ${CARDINAL_VERSION}
+ RESULT_VARIABLE CARDINAL_CHECKOUT_RESULT
+ OUTPUT_VARIABLE CARDINAL_CHECKOUT_OUTPUT
+ ERROR_VARIABLE CARDINAL_CHECKOUT_ERROR
+ OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
+
+ if(NOT CARDINAL_CHECKOUT_RESULT EQUAL "0")
+ message(
+ FATAL_ERROR "Failed to checkout cardinal: ${CARDINAL_CHECKOUT_ERROR}")
  endif()
 endif()