Merge branch 'dev' of https://github.com/janhq/cortex.cpp into s/fix/config-rc

Author: sangjanai

.github/workflows/cortex-cpp-quality-gate.yml

@@ -137,13 +137,23 @@ jobs:
 
 
       - name: Run setup config
+        if: runner.os != 'Linux'
         run: |
           cd engine
           echo "huggingFaceToken: ${{ secrets.HUGGINGFACE_TOKEN_READ }}" > ~/.cortexrc
           echo "gitHubToken: ${{ secrets.PAT_SERVICE_ACCOUNT }}" >> ~/.cortexrc
           # ./build/cortex
           cat ~/.cortexrc
 
+      - name: Run setup config
+        if: runner.os == 'Linux'
+        run: |
+          cd engine
+          echo "huggingFaceToken: ${{ secrets.HUGGINGFACE_TOKEN_READ }}" > ~/.config/cortexcpp/.cortexrc
+          echo "gitHubToken: ${{ secrets.PAT_SERVICE_ACCOUNT }}" >> ~/.config/cortexcpp/.cortexrc
+          # ./build/cortex
+          cat ~/.config/cortexcpp/.cortexrc
+
       - name: Run unit tests
         run: |
           cd engine
@@ -152,13 +162,24 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.PAT_SERVICE_ACCOUNT }}
 
       - name: Run setup config
+        if: runner.os != 'Linux'
         run: |
           cd engine
           echo "apiServerPort: 3928" > ~/.cortexrc
           echo "huggingFaceToken: ${{ secrets.HUGGINGFACE_TOKEN_READ }}" >> ~/.cortexrc
           echo "gitHubToken: ${{ secrets.PAT_SERVICE_ACCOUNT }}" >> ~/.cortexrc
           # ./build/cortex
           cat ~/.cortexrc
+      
+      - name: Run setup config
+        if: runner.os == 'Linux'
+        run: |
+          cd engine
+          echo "apiServerPort: 3928" > ~/.config/cortexcpp/.cortexrc
+          echo "huggingFaceToken: ${{ secrets.HUGGINGFACE_TOKEN_READ }}" >> ~/.config/cortexcpp/.cortexrc
+          echo "gitHubToken: ${{ secrets.PAT_SERVICE_ACCOUNT }}" >> ~/.config/cortexcpp/.cortexrc
+          # ./build/cortex
+          cat ~/.config/cortexcpp/.cortexrc
 
       - name: Run e2e tests
         if: github.event_name != 'schedule' && runner.os != 'Windows' && github.event.pull_request.draft == false
@@ -226,6 +247,13 @@ jobs:
           cd engine
           make package
 
+      - name: Upload E2E Log
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: e2e-log-${{ matrix.os }}-${{ matrix.name }}
+          path: ./engine/e2e-test/logs
+      
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -414,12 +442,21 @@ jobs:
           make build CMAKE_EXTRA_FLAGS="${{ matrix.cmake-flags }}" BUILD_DEPS_CMAKE_EXTRA_FLAGS="${{ matrix.build-deps-cmake-flags }}"
 
       - name: Run setup config
+        if: runner.os != 'Linux'
         run: |
           cd engine
           echo "gitHubToken: ${{ secrets.GITHUB_TOKEN }}" > ~/.cortexrc
           # ./build/cortex
           cat ~/.cortexrc
 
+      - name: Run setup config
+        if: runner.os == 'Linux'
+        run: |
+          cd engine
+          echo "gitHubToken: ${{ secrets.GITHUB_TOKEN }}" > ~/.config/cortexcpp/.cortexrc
+          # ./build/cortex
+          cat ~/.config/cortexcpp/.cortexrc
+
       - name: Run unit tests
         run: |
           cd engine
@@ -428,12 +465,22 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.PAT_SERVICE_ACCOUNT }}
 
       - name: Run setup config
+        if: runner.os != 'Linux'
         run: |
           cd engine
           echo "apiServerPort: 3928" > ~/.cortexrc
           echo "gitHubToken: ${{ secrets.GITHUB_TOKEN }}" > ~/.cortexrc
           # ./build/cortex
           cat ~/.cortexrc
+      
+      - name: Run setup config
+        if: runner.os == 'Linux'
+        run: |
+          cd engine
+          echo "apiServerPort: 3928" > ~/.config/cortexcpp/.cortexrc
+          echo "gitHubToken: ${{ secrets.GITHUB_TOKEN }}" > ~/.config/cortexcpp/.cortexrc
+          # ./build/cortex
+          cat ~/.config/cortexcpp/.cortexrc
 
       - name: Run e2e tests
         if: github.event_name != 'schedule' && runner.os != 'Windows' && github.event.pull_request.draft == false

.github/workflows/test-cortexso-model-hub.yml

@@ -67,7 +67,7 @@ jobs:
         run: |
           cd engine
           ./build/cortex --version
-          sed -i 's/huggingFaceToken: ""/huggingFaceToken: "${{ secrets.HUGGINGFACE_TOKEN_READ }}"/' ~/.cortexrc
+          sed -i 's/huggingFaceToken: ""/huggingFaceToken: "${{ secrets.HUGGINGFACE_TOKEN_READ }}"/' ~/.config/cortexcpp/.cortexrc
 
       - name: Run e2e tests
         run: |

.gitignore

@@ -17,6 +17,7 @@ build
 platform/cortex.exe
 platform/package-lock.json
 .vscode
+.vs
 platform/command
 platform/src/infrastructure/commanders/test/test_data
 **/vcpkg_installed

BUILDING.md

@@ -33,8 +33,8 @@ cd vcpkg
 ```bash
 mkdir build
 cd build
-cmake .. -DBUILD_SHARED_LIBS=OFF -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
-cmake --build . --config Release
+cmake .. -DBUILD_SHARED_LIBS=OFF "-DCMAKE_TOOLCHAIN_FILE=..\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows-static
+cmake --build . --config Release -j4
 ```
 
 4. Verify that Cortex.cpp is installed correctly by getting help information.

docker/entrypoint.sh

@@ -2,8 +2,9 @@
 
 # Install cortex.llamacpp engine
 
-echo "apiServerHost: 0.0.0.0" > /root/.cortexrc
-echo "enableCors: true" >> /root/.cortexrc
+mkdir -p /root/.config/cortexcpp
+echo "apiServerHost: 0.0.0.0" > /root/.config/cortexcpp/.cortexrc
+echo "enableCors: true" >> /root/.config/cortexcpp/.cortexrc
 
 # Start the cortex server
 cortex start
@@ -15,6 +16,6 @@ cortex engines list
 
 
 # Keep the container running by tailing the log files
-tail -f /root/cortexcpp/logs/cortex.log &
-tail -f /root/cortexcpp/logs/cortex-cli.log &
+tail -f /root/.local/share/cortexcpp/logs/cortex.log &
+tail -f /root/.local/share/cortexcpp/logs/cortex-cli.log &
 wait