Merge pull request #2178 from menloresearch/dev

chore: sync dev to main

Author: vansangpfiev

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

@@ -137,13 +137,24 @@ 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
+          mkdir -p ~/.config/cortexcpp/
+          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 +163,25 @@ 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
+          mkdir -p ~/.config/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
+          # ./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 +249,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 +444,22 @@ 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
+          mkdir -p ~/.config/cortexcpp/
+          echo "gitHubToken: ${{ secrets.GITHUB_TOKEN }}" > ~/.config/cortexcpp/.cortexrc
+          # ./build/cortex
+          cat ~/.config/cortexcpp/.cortexrc
+
       - name: Run unit tests
         run: |
           cd engine
@@ -428,12 +468,23 @@ 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
+          mkdir -p ~/.config/cortexcpp/
+          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/cortex-docs-new-release.yml

@@ -0,0 +1,69 @@
+name: Deploy Docs on new release
+
+on:
+  release:
+    types:
+      - published
+      - edited
+      - released
+
+jobs:
+  deploy:
+    name: Deploy to CloudFlare Pages
+    env:
+      CLOUDFLARE_PROJECT_NAME: cortex-docs
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      deployments: write
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: dev
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install jq      
+        uses: dcarbone/[email protected]
+
+      - name: Fill env vars
+        working-directory: docs
+        continue-on-error: true
+        run: |
+          env_example_file=".env.example"
+          touch .env
+          while IFS= read -r line || [[ -n "$line" ]]; do
+            if [[ "$line" == *"="* ]]; then
+              var_name=$(echo $line | cut -d '=' -f 1)
+              echo $var_name
+              var_value="$(jq -r --arg key "$var_name" '.[$key]' <<< "$SECRETS")"
+              echo "$var_name=$var_value" >> .env
+            fi
+          done < "$env_example_file"
+        env:
+          SECRETS: '${{ toJson(secrets) }}'
+
+      - name: Install dependencies
+        working-directory: docs
+        run: yarn install
+      - name: Build website
+        working-directory: docs
+        run: export NODE_ENV=production && yarn build
+
+      - name: Copy redirect file
+        working-directory: docs
+        continue-on-error: true
+        run: cp _redirects build/_redirects
+  
+      - name: Publish to Cloudflare Pages Production
+        uses: cloudflare/pages-action@v1
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          projectName: ${{ env.CLOUDFLARE_PROJECT_NAME }}
+          directory: ./docs/build
+          branch: main
+          # Optional: Enable this if you want to have GitHub Deployments triggered
+          gitHubToken: ${{ secrets.GITHUB_TOKEN }}

.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.