Merge pull request #16 from qdrvm/ci/build_update

Ci/build update
qdrvm · Dec 8, 2024 · ee8955a · ee8955a
2 parents c8559a4 + 0a86558
commit ee8955a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/.ci/.env b/.ci/.env
@@ -30,5 +30,5 @@ MACOS_PACKAGES="make \
   zip"
 
 CMAKE_VERSION=3.31.1
-VCPKG_FORCE_SYSTEM_BINARIES=1
 DEBIAN_FRONTEND=noninteractive
+#VCPKG_FORCE_SYSTEM_BINARIES=1
diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
@@ -19,7 +19,7 @@ on:
 env:
   USE_CACHE: ${{ github.event.inputs.use_cache || 'true' }}
   CACHE_VERSION: v01
-  CACHE_PATHS: |
+  CACHE_PATH: |
     ~/.cargo
     ~/.hunter
     ~/.cache/pip
@@ -28,32 +28,44 @@ env:
     .venv
     .build
 
+
 jobs:
   build-and-test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-24.04, macos-15]
+      fail-fast: false
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-
+        with:
+          submodules: true
+          fetch-depth: 0
+
       - name: "Restore cache dependencies"
         id: cache-restore
         if: ${{ env.USE_CACHE == 'true' }}
         uses: actions/cache/restore@v4
         with:
-          path: ${{ env.CACHE_PATHS }}
+          path: ${{ env.CACHE_PATH }}
           key: jam-${{ runner.os }}-${{ github.job }}-${{ env.CACHE_VERSION }}
           restore-keys: |
             jam-${{ runner.os }}-${{ github.job }}
             jam-${{ runner.os }}
             
       - name: "Basic init"
-        run: ./.ci/scripts/init.sh
-
+        run: |
+          if [[ $RUNNER_OS == "Linux" ]]; then
+            sudo ./.ci/scripts/init.sh
+          else
+            ./.ci/scripts/init.sh
+          fi
+
       - name: "Init all dependencies"
-        run: make init_all
+        run: |
+            make init_py
+            make init_vcpkg
         
       - name: "Configure"
         run: make configure