chore: cleanup and CIs update

sangjanai · sangjanai · commit 584f46b991af · 2025-04-03T11:28:15.000+07:00
diff --git a/.github/workflows/cortex-cpp-quality-gate.yml b/.github/workflows/cortex-cpp-quality-gate.yml
@@ -97,29 +97,6 @@ jobs:
           AWS_SECRET_ACCESS_KEY: "${{ secrets.MINIO_SECRET_ACCESS_KEY }}"
           AWS_DEFAULT_REGION: "${{ secrets.MINIO_REGION }}"
 
-      - name: Configure vcpkg
-        if: runner.os != 'Linux'
-        run: |
-          cd engine
-          make configure-vcpkg
-
-      - name: Configure vcpkg linux amd64
-        if: runner.os != 'Linux'
-        run: |
-          cd engine
-          make configure-vcpkg
-
-      - name: Configure vcpkg linux arm64
-        if: runner.os == 'Linux'
-        run: |
-          cd engine
-          # Set env if arch is arm64
-          if [ "${{ matrix.name }}" == "arm64" ]; then
-            sudo apt install ninja-build pkg-config -y
-            export VCPKG_FORCE_SYSTEM_BINARIES=1
-          fi
-          make configure-vcpkg
-
       - name: Build
         if: runner.os != 'Linux'
         run: |
@@ -405,29 +382,6 @@ jobs:
         run: |
           choco install make pkgconfiglite ccache awscli 7zip ninja -y
 
-      - name: Configure vcpkg
-        if: runner.os != 'Linux'
-        run: |
-          cd engine
-          make configure-vcpkg
-
-      - name: Configure vcpkg linux amd64
-        if: runner.os != 'Linux'
-        run: |
-          cd engine
-          make configure-vcpkg
-
-      - name: Configure vcpkg linux arm64
-        if: runner.os == 'Linux'
-        run: |
-          cd engine
-          # Set env if arch is arm64
-          if [ "${{ matrix.name }}" == "arm64" ]; then
-            sudo apt install ninja-build pkg-config -y
-            export VCPKG_FORCE_SYSTEM_BINARIES=1
-          fi
-          make configure-vcpkg
-
       - name: Build
         if: runner.os != 'Linux'
         run: |
diff --git a/.github/workflows/template-build-linux.yml b/.github/workflows/template-build-linux.yml
@@ -127,16 +127,6 @@ jobs:
           sudo apt update && sudo apt install gettext-base -y
           python3 -m pip install awscli
 
-      - name: Configure vcpkg
-        run: |
-          cd engine
-          # Set env if arch is arm64
-          if [ "${{ inputs.arch }}" == "arm64" ]; then
-            sudo apt install ninja-build pkg-config -y
-            export VCPKG_FORCE_SYSTEM_BINARIES=1
-          fi
-          make configure-vcpkg
-
       - name: Build
         run: |
           cd engine
diff --git a/.github/workflows/template-build-macos.yml b/.github/workflows/template-build-macos.yml
@@ -139,11 +139,6 @@ jobs:
 
       - name: Install jq
         uses: dcarbone/install-jq-action@v2.0.1
-
-      - name: Configure vcpkg
-        run: |
-          cd engine
-          make configure-vcpkg
       
       - name: Build
         run: |
diff --git a/.github/workflows/template-build-windows-x64.yml b/.github/workflows/template-build-windows-x64.yml
@@ -156,12 +156,6 @@ jobs:
           AWS_SECRET_ACCESS_KEY: "${{ secrets.MINIO_SECRET_ACCESS_KEY }}"
           AWS_DEFAULT_REGION: "${{ secrets.MINIO_REGION }}"
 
-      - name: Configure vcpkg
-        shell: cmd
-        run: |
-          cd engine
-          make configure-vcpkg
-
       - name: Build
         run: |
           cd engine
diff --git a/.github/workflows/test-cortexso-model-hub.yml b/.github/workflows/test-cortexso-model-hub.yml
@@ -45,11 +45,6 @@ jobs:
           AWS_SECRET_ACCESS_KEY: "${{ secrets.MINIO_SECRET_ACCESS_KEY }}"
           AWS_DEFAULT_REGION: "${{ secrets.MINIO_REGION }}"
 
-      - name: Configure vcpkg
-        run: |
-          cd engine
-          make configure-vcpkg
-
       - name: Build
         run: |
           cd engine
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -53,7 +53,7 @@ COPY ./docs/static/openapi/cortex.json /app/docs/static/openapi/cortex.json
 
 # Build project
 # Configure vcpkg binary sources
-RUN cd engine && make configure-vcpkg && make build CMAKE_EXTRA_FLAGS="-DCORTEX_CPP_VERSION=${CORTEX_CPP_VERSION} -DCMAKE_BUILD_TEST=OFF -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ${CMAKE_EXTRA_FLAGS}"
+RUN cd engine && make build CMAKE_EXTRA_FLAGS="-DCORTEX_CPP_VERSION=${CORTEX_CPP_VERSION} -DCMAKE_BUILD_TEST=OFF -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ${CMAKE_EXTRA_FLAGS}"
 
 # Stage 3: Runtime
 FROM common as runtime
diff --git a/docker/Dockerfile.cache b/docker/Dockerfile.cache
@@ -83,7 +83,7 @@ COPY ./docs/static/openapi/cortex.json /app/docs/static/openapi/cortex.json
 # Build project
 # Configure vcpkg binary sources
 RUN export VCPKG_BINARY_SOURCES="files,${LOCAL_CACHE_DIR},readwrite;default"; \
-    cd engine && make configure-vcpkg && make build CMAKE_EXTRA_FLAGS="-DCORTEX_CPP_VERSION=${CORTEX_CPP_VERSION} -DCMAKE_BUILD_TEST=OFF -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ${CMAKE_EXTRA_FLAGS}"
+    cd engine && make build CMAKE_EXTRA_FLAGS="-DCORTEX_CPP_VERSION=${CORTEX_CPP_VERSION} -DCMAKE_BUILD_TEST=OFF -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ${CMAKE_EXTRA_FLAGS}"
 
     # Upload updated cache to MinIO (if remote cache is provided)
 RUN if [ -n "${REMOTE_CACHE_URL}" ]; then \
diff --git a/docs/docs/installation/linux.mdx b/docs/docs/installation/linux.mdx
@@ -91,7 +91,6 @@ sudo /usr/bin/cortex-uninstall.sh
 
     ```bash
     cd engine
-    make configure-vcpkg
     make build CMAKE_EXTRA_FLAGS="-DCORTEX_CPP_VERSION=$(git rev-parse HEAD) -DCMAKE_BUILD_TEST=OFF -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
     ```
 
diff --git a/docs/docs/installation/mac.mdx b/docs/docs/installation/mac.mdx
@@ -90,14 +90,12 @@ The script requires sudo permission.
     <TabItem value="Mac Silicon" label="Mac Silicon">
     ```sh
     cd engine
-    make configure-vcpkg
     make build CMAKE_EXTRA_FLAGS="-DCORTEX_CPP_VERSION=latest -DCMAKE_BUILD_TEST=OFF -DMAC_ARM64=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
     ```
     </TabItem>
     <TabItem value="Mac Intel" label="Mac Intel">
     ```sh
     cd engine
-    make configure-vcpkg
     make build CMAKE_EXTRA_FLAGS="-DCORTEX_CPP_VERSION=latest -DCMAKE_BUILD_TEST=OFF -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
     ```
     </TabItem>
diff --git a/docs/docs/installation/windows.mdx b/docs/docs/installation/windows.mdx
@@ -85,7 +85,6 @@ Follow the [linux installation steps](linux) to install Cortex.cpp on the WSL.
 
     ```cmd
     cd engine
-    make configure-vcpkg
     make build CMAKE_EXTRA_FLAGS="-DCORTEX_CPP_VERSION=latest -DCMAKE_BUILD_TEST=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_TOOLCHAIN_FILE=vcpkg\\scripts\\buildsystems\\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_BUILD_TYPE=RELEASE -GNinja"
     ```
 
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -15,47 +15,47 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 option(CORTEX_CQA "Enable Cortex Code Quality Assurance(DO NOT TURN THIS ON unless you know what you are doing)" OFF)
 
 if(CORTEX_CQA)
-    message(STATUS "CORTEX_CQA is ON: Enabling debug symbols, ASan, All Warnings, and treating Warnings as Errors")
-
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
-        add_compile_options(-fsanitize=address -Wall -Wextra -Wpedantic -Werror -g)
-        add_link_options(-fsanitize=address)
-    elseif(MSVC)
-        # TODO: Sang, test on Windows and setup MSVC accordingly
-        add_compile_options(/INFERASAN /Wall /WX /Zi)
-        add_link_options(/DEBUG)
-        message(WARNING "Address Sanitizer might require additional setup on MSVC. Please refer to MSVC documentation for ASan.")
-    else()
-        message(WARNING "Address Sanitizer and warning flags are not automatically configured for this compiler. Please configure them manually if supported.")
-    endif()
+  message(STATUS "CORTEX_CQA is ON: Enabling debug symbols, ASan, All Warnings, and treating Warnings as Errors")
+
+  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
+    add_compile_options(-fsanitize=address -Wall -Wextra -Wpedantic -Werror -g)
+    add_link_options(-fsanitize=address)
+  elseif(MSVC)
+    # TODO: Sang, test on Windows and setup MSVC accordingly
+    add_compile_options(/INFERASAN /Wall /WX /Zi)
+    add_link_options(/DEBUG)
+    message(WARNING "Address Sanitizer might require additional setup on MSVC. Please refer to MSVC documentation for ASan.")
+  else()
+    message(WARNING "Address Sanitizer and warning flags are not automatically configured for this compiler. Please configure them manually if supported.")
+  endif()
 else()
-    message(STATUS "CORTEX_CQA is OFF.")
+  message(STATUS "CORTEX_CQA is OFF.")
 endif()
 
 if(NOT CORTEX_CQA)
-    message(STATUS "Setting up optimization flags for Release builds")
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
-        # Add optimization flags for GCC/Clang
-        add_compile_options($<$<CONFIG:Release>:-O3>)
-        add_compile_options($<$<CONFIG:Release>:-flto>)
-        add_link_options($<$<CONFIG:Release>:-flto>)
-    elseif(MSVC)
-        # Add optimization flags for MSVC
-        add_compile_options($<$<CONFIG:Release>:/O2>)
-        # Optional: Link-time optimization
-        add_compile_options($<$<CONFIG:Release>:/GL>)
-        add_link_options($<$<CONFIG:Release>:/LTCG>)
-    endif()
+  message(STATUS "Setting up optimization flags for Release builds")
+  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
+    # Add optimization flags for GCC/Clang
+    add_compile_options($<$<CONFIG:Release>:-O3>)
+    add_compile_options($<$<CONFIG:Release>:-flto>)
+    add_link_options($<$<CONFIG:Release>:-flto>)
+  elseif(MSVC)
+    # Add optimization flags for MSVC
+    add_compile_options($<$<CONFIG:Release>:/O2>)
+    # Optional: Link-time optimization
+    add_compile_options($<$<CONFIG:Release>:/GL>)
+    add_link_options($<$<CONFIG:Release>:/LTCG>)
+  endif()
 endif()
 
 if(MSVC)
-# set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+  # set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
   add_compile_options(
-  #     $<$<CONFIG:>:/MT> #---------|
-  #     $<$<CONFIG:Debug>:/MTd> #---|-- Statically link the runtime libraries
-  #     $<$<CONFIG:Release>:/MT> #--|
-      $<$<CONFIG:Release>:/O2> #--|-- Optimize for speed in Release mode
-      $<$<CONFIG:Release>:/Ob2> #-|-- Inline any suitable function
+    #     $<$<CONFIG:>:/MT> #---------|
+    #     $<$<CONFIG:Debug>:/MTd> #---|-- Statically link the runtime libraries
+    #     $<$<CONFIG:Release>:/MT> #--|
+    $<$<CONFIG:Release>:/O2> #--|-- Optimize for speed in Release mode
+    $<$<CONFIG:Release>:/Ob2> #-|-- Inline any suitable function
   )
 
   add_compile_options(/utf-8)
@@ -127,80 +127,87 @@ string(LENGTH "${JSON_CONTENT}" CONTENT_LENGTH)
 message("Content length: ${CONTENT_LENGTH}")
 
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cortex_openapi.h"
-    "#pragma once\n"
-    "#include <string>\n"
-    "#include <sstream>\n\n"
-    "namespace CortexOpenApi {\n"
+  "#pragma once\n"
+  "#include <string>\n"
+  "#include <sstream>\n\n"
+  "namespace CortexOpenApi {\n"
 )
 
 set(CHUNK_SIZE 2000)
 set(OFFSET 0)
 set(CHUNK_INDEX 0)
 
 while(${OFFSET} LESS ${CONTENT_LENGTH})
-    math(EXPR REMAINING "${CONTENT_LENGTH} - ${OFFSET}")
-
-    if(${REMAINING} LESS ${CHUNK_SIZE})
-        string(SUBSTRING "${JSON_CONTENT}" ${OFFSET} ${REMAINING} CHUNK_CONTENT)
-        math(EXPR OFFSET "${OFFSET} + ${REMAINING}")
-    else()
-        string(SUBSTRING "${JSON_CONTENT}" ${OFFSET} ${CHUNK_SIZE} CHUNK_CONTENT)
-        math(EXPR OFFSET "${OFFSET} + ${CHUNK_SIZE}")
-    endif()
-
-    # Escape special characters
-    string(REPLACE "\\" "\\\\" CHUNK_CONTENT "${CHUNK_CONTENT}")
-    string(REPLACE "\"" "\\\"" CHUNK_CONTENT "${CHUNK_CONTENT}")
-    string(REPLACE "\n" "\\n" CHUNK_CONTENT "${CHUNK_CONTENT}")
-
-    file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/cortex_openapi.h"
-        "    inline std::string const json_part_${CHUNK_INDEX} = \"${CHUNK_CONTENT}\";\n"
-    )
-
-    math(EXPR CHUNK_INDEX "${CHUNK_INDEX} + 1")
+  math(EXPR REMAINING "${CONTENT_LENGTH} - ${OFFSET}")
+
+  if(${REMAINING} LESS ${CHUNK_SIZE})
+    string(SUBSTRING "${JSON_CONTENT}" ${OFFSET} ${REMAINING} CHUNK_CONTENT)
+    math(EXPR OFFSET "${OFFSET} + ${REMAINING}")
+  else()
+    string(SUBSTRING "${JSON_CONTENT}" ${OFFSET} ${CHUNK_SIZE} CHUNK_CONTENT)
+    math(EXPR OFFSET "${OFFSET} + ${CHUNK_SIZE}")
+  endif()
+
+  # Escape special characters
+  string(REPLACE "\\" "\\\\" CHUNK_CONTENT "${CHUNK_CONTENT}")
+  string(REPLACE "\"" "\\\"" CHUNK_CONTENT "${CHUNK_CONTENT}")
+  string(REPLACE "\n" "\\n" CHUNK_CONTENT "${CHUNK_CONTENT}")
+
+  file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/cortex_openapi.h"
+    "    inline std::string const json_part_${CHUNK_INDEX} = \"${CHUNK_CONTENT}\";\n"
+  )
+
+  math(EXPR CHUNK_INDEX "${CHUNK_INDEX} + 1")
 endwhile()
 
 # Add the get function that concatenates all parts
 file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/cortex_openapi.h"
-    "\n    inline std::string GetOpenApiJson() {\n"
-    "        std::ostringstream ss;\n"
+  "\n    inline std::string GetOpenApiJson() {\n"
+  "        std::ostringstream ss;\n"
 )
 
 # Add each part to the stream
 set(INDEX 0)
 while(${INDEX} LESS ${CHUNK_INDEX})
-    file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/cortex_openapi.h"
-        "        ss << json_part_${INDEX};\n"
-    )
-    math(EXPR INDEX "${INDEX} + 1")
+  file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/cortex_openapi.h"
+    "        ss << json_part_${INDEX};\n"
+  )
+  math(EXPR INDEX "${INDEX} + 1")
 endwhile()
 
 file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/cortex_openapi.h"
-    "        return ss.str();\n"
-    "    }\n"
-    "}\n"
+  "        return ss.str();\n"
+  "    }\n"
+  "}\n"
 )
 ## End of generating openapi json
 MESSAGE("SOURCE_DIR"${CMAKE_CURRENT_SOURCE_DIR})
 add_executable(${TARGET_NAME} main.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/utils/cpuid/cpu_info.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/utils/file_logger.cc
-
-    ${CMAKE_CURRENT_SOURCE_DIR}/extensions/template_renderer.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/utils/cpuid/cpu_info.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/utils/file_logger.cc
 
-    ${CMAKE_CURRENT_SOURCE_DIR}/utils/dylib_path_manager.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/utils/process/utils.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/extensions/template_renderer.cc
 
-    ${CMAKE_CURRENT_SOURCE_DIR}/extensions/remote-engine/remote_engine.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/utils/dylib_path_manager.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/utils/process/utils.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/utils/curl_utils.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/extensions/remote-engine/remote_engine.cc
 
 )
 
 target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 # MESSAGE("ssl="${CMAKE_CURRENT_BINARY_DIR}/openssl-src/include)
-target_include_directories(${TARGET_NAME} PRIVATE  ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl/include)
-target_include_directories(${TARGET_NAME} PRIVATE  ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/jsoncpp-lib/include)
-target_include_directories(${TARGET_NAME} PRIVATE  ${CMAKE_CURRENT_BINARY_DIR}/../build/_deps/libarchive-src/libarchive)
-target_include_directories(${TARGET_NAME} PRIVATE  ${CMAKE_CURRENT_BINARY_DIR}/../build/_deps/minizip-src)
+target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl/include)
+target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/jsoncpp-lib/include)
+target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../build/_deps/libarchive-src/libarchive)
+target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../build/_deps/minizip-src)
+
+if(APPLE)
+  find_library(COREFOUNDATION_LIB CoreFoundation)
+  find_library(FOUNDATION_LIB Foundation)
+  find_library(CORESERVICES_LIB CoreServices)
+  target_link_libraries(${TARGET_NAME} PRIVATE ${COREFOUNDATION_LIB} ${FOUNDATION_LIB} ${CORESERVICES_LIB})
+endif()
 
 target_link_libraries(${TARGET_NAME} PRIVATE minizip)
 target_link_libraries(${TARGET_NAME} PRIVATE archive)
@@ -236,12 +243,12 @@ aux_source_directory(extensions EX_SRC)
 aux_source_directory(migrations MIGR_SRC)
 aux_source_directory(utils UTILS_SRC)
 
-target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} )
+target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_sources(${TARGET_NAME} PRIVATE ${UTILS_SRC} ${CONFIG_SRC} ${CTL_SRC} ${COMMON_SRC} ${SERVICES_SRC} ${DB_SRC} ${EX_SRC} ${MIGR_SRC} ${REPO_SRC})
 
 set_target_properties(${TARGET_NAME} PROPERTIES
-                      RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}
-                      RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}
-                      RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+  RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}
+  RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
 )
diff --git a/engine/Makefile b/engine/Makefile
diff --git a/engine/cmake/drogon.cmake b/engine/cmake/drogon.cmake
diff --git a/engine/cmake/openssl.cmake b/engine/cmake/openssl.cmake
diff --git a/engine/test/components/test_cortex_config.cc b/engine/test/components/test_cortex_config.cc
diff --git a/engine/utils/curl_utils.h b/engine/utils/curl_utils.h
