From 837f1707be9780f44b7be2553e6e6de45d5a03ef Mon Sep 17 00:00:00 2001 From: Minh141120 Date: Thu, 3 Apr 2025 17:31:02 +0700 Subject: [PATCH 1/4] chore: download cmake version 3.22.6 --- docker/Dockerfile | 12 +++++++++++- docker/Dockerfile.cache | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 744c3899c..09dfe56fb 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -37,11 +37,21 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul ninja-build \ pkg-config \ python3-pip \ - openssl && \ + openssl \ + libssl-dev && \ pip3 install awscli && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +# Download and install CMake 3.22.6 +RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.6/cmake-3.22.6.tar.gz -q -O /tmp/cmake.tar.gz && \ + tar -xzf /tmp/cmake.tar.gz -C /tmp && \ + cd /tmp/cmake-3.22.6 && \ + ./bootstrap && \ + make -j$(nproc) && \ + make install && \ + rm -rf /tmp/cmake.tar.gz /tmp/cmake-3.22.6 + ARG CORTEX_CPP_VERSION=latest ARG CMAKE_EXTRA_FLAGS="" diff --git a/docker/Dockerfile.cache b/docker/Dockerfile.cache index 0a9cbe02d..d4b539945 100644 --- a/docker/Dockerfile.cache +++ b/docker/Dockerfile.cache @@ -37,11 +37,21 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul ninja-build \ pkg-config \ python3-pip \ - openssl && \ + openssl \ + libssl-dev && \ pip3 install awscli && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +# Download and install CMake 3.22.6 +RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.6/cmake-3.22.6.tar.gz -q -O /tmp/cmake.tar.gz && \ + tar -xzf /tmp/cmake.tar.gz -C /tmp && \ + cd /tmp/cmake-3.22.6 && \ + ./bootstrap && \ + make -j$(nproc) && \ + make install && \ + rm -rf /tmp/cmake.tar.gz /tmp/cmake-3.22.6 + ARG CORTEX_CPP_VERSION=latest ARG CMAKE_EXTRA_FLAGS="" From 8bcf48dd9730cab08682371a825409a05cfb64e0 Mon Sep 17 00:00:00 2001 From: Minh141120 Date: Thu, 3 Apr 2025 17:33:52 +0700 Subject: [PATCH 2/4] chore: remove cmake install deps step --- docker/Dockerfile | 1 - docker/Dockerfile.cache | 1 - 2 files changed, 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 09dfe56fb..5f04da12e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -24,7 +24,6 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" && \ apt-get update && \ apt-get install -y --no-install-recommends \ - cmake \ make \ git \ uuid-dev \ diff --git a/docker/Dockerfile.cache b/docker/Dockerfile.cache index d4b539945..3eabc5dce 100644 --- a/docker/Dockerfile.cache +++ b/docker/Dockerfile.cache @@ -24,7 +24,6 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" && \ apt-get update && \ apt-get install -y --no-install-recommends \ - cmake \ make \ git \ uuid-dev \ From 8478e5ea6d0bad77a47b889cf1eeef8c173d2c91 Mon Sep 17 00:00:00 2001 From: Minh141120 Date: Thu, 3 Apr 2025 17:38:58 +0700 Subject: [PATCH 3/4] chore: trigger quality gate ci to test --- .github/workflows/cortex-cpp-quality-gate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cortex-cpp-quality-gate.yml b/.github/workflows/cortex-cpp-quality-gate.yml index 279dd77d6..024cf677d 100644 --- a/.github/workflows/cortex-cpp-quality-gate.yml +++ b/.github/workflows/cortex-cpp-quality-gate.yml @@ -8,6 +8,7 @@ on: schedule: - cron: '0 22 * * *' + env: LLM_MODEL_URL: https://delta.jan.ai/tinyllama-1.1b-chat-v0.3.Q2_K.gguf EMBEDDING_MODEL_URL: https://catalog.jan.ai/dist/models/embeds/nomic-embed-text-v1.5.f16.gguf From e98c17a118731fc52113009902b12374001fef2b Mon Sep 17 00:00:00 2001 From: sangjanai Date: Thu, 3 Apr 2025 17:55:05 +0700 Subject: [PATCH 4/4] chore: update run setup config --- .github/workflows/cortex-cpp-quality-gate.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cortex-cpp-quality-gate.yml b/.github/workflows/cortex-cpp-quality-gate.yml index 024cf677d..fc2d52b63 100644 --- a/.github/workflows/cortex-cpp-quality-gate.yml +++ b/.github/workflows/cortex-cpp-quality-gate.yml @@ -8,7 +8,6 @@ on: schedule: - cron: '0 22 * * *' - env: LLM_MODEL_URL: https://delta.jan.ai/tinyllama-1.1b-chat-v0.3.Q2_K.gguf EMBEDDING_MODEL_URL: https://catalog.jan.ai/dist/models/embeds/nomic-embed-text-v1.5.f16.gguf @@ -151,6 +150,7 @@ jobs: run: | cd engine mkdir -p ~/.config/cortexcpp/ + mkdir -p ~/.local/share/cortexcpp/ echo "huggingFaceToken: ${{ secrets.HUGGINGFACE_TOKEN_READ }}" > ~/.config/cortexcpp/.cortexrc echo "gitHubToken: ${{ secrets.PAT_SERVICE_ACCOUNT }}" >> ~/.config/cortexcpp/.cortexrc # ./build/cortex @@ -178,6 +178,7 @@ jobs: run: | cd engine mkdir -p ~/.config/cortexcpp/ + mkdir -p ~/.local/share/cortexcpp/ echo "apiServerPort: 3928" > ~/.config/cortexcpp/.cortexrc echo "huggingFaceToken: ${{ secrets.HUGGINGFACE_TOKEN_READ }}" >> ~/.config/cortexcpp/.cortexrc echo "gitHubToken: ${{ secrets.PAT_SERVICE_ACCOUNT }}" >> ~/.config/cortexcpp/.cortexrc @@ -457,6 +458,7 @@ jobs: run: | cd engine mkdir -p ~/.config/cortexcpp/ + mkdir -p ~/.local/share/cortexcpp/ echo "gitHubToken: ${{ secrets.GITHUB_TOKEN }}" > ~/.config/cortexcpp/.cortexrc # ./build/cortex cat ~/.config/cortexcpp/.cortexrc @@ -482,6 +484,7 @@ jobs: run: | cd engine mkdir -p ~/.config/cortexcpp/ + mkdir -p ~/.local/share/cortexcpp/ echo "apiServerPort: 3928" > ~/.config/cortexcpp/.cortexrc echo "gitHubToken: ${{ secrets.GITHUB_TOKEN }}" > ~/.config/cortexcpp/.cortexrc # ./build/cortex