diff --git a/.github/workflows/build-vcpkg-tst.yml b/.github/workflows/build-vcpkg-tst.yml index 2828452..0cda14d 100644 --- a/.github/workflows/build-vcpkg-tst.yml +++ b/.github/workflows/build-vcpkg-tst.yml @@ -33,6 +33,7 @@ jobs: rm -f blint.db - name: Build and upload db run: | + export VCPKG_FORCE_SYSTEM_BINARIES=arm mkdir -p temp source venv/bin/activate cd blint-db/ diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml index 4f41689..b8bd64d 100644 --- a/.github/workflows/build-vcpkg.yml +++ b/.github/workflows/build-vcpkg.yml @@ -33,6 +33,7 @@ jobs: rm -f blint.db - name: Build and upload db run: | + export VCPKG_FORCE_SYSTEM_BINARIES=arm mkdir -p temp source venv/bin/activate cd blint-db/ diff --git a/blint_db/config.py b/blint_db/config.py index 852a565..7ad8a68 100644 --- a/blint_db/config.py +++ b/blint_db/config.py @@ -30,3 +30,5 @@ COMMON_CONNECTION = None # COMMON_CONNECTION = sqlite3.connect(":memory:") + +ARCH_OS="arm64-linux" diff --git a/blint_db/handlers/language_handlers/vcpkg_handler.py b/blint_db/handlers/language_handlers/vcpkg_handler.py index d58683d..181faae 100644 --- a/blint_db/handlers/language_handlers/vcpkg_handler.py +++ b/blint_db/handlers/language_handlers/vcpkg_handler.py @@ -1,7 +1,7 @@ import os import subprocess -from blint_db import (DEBUG_MODE, VCPKG_HASH, VCPKG_LOCATION, VCPKG_URL, +from blint_db import (DEBUG_MODE, VCPKG_HASH, VCPKG_LOCATION, VCPKG_URL, ARCH_OS, logger) from blint_db.handlers.git_handler import git_checkout_commit, git_clone from blint_db.handlers.language_handlers import BaseHandler @@ -85,7 +85,7 @@ def vcpkg_build(project_name): def find_vcpkg_executables(project_name): - project_path = f"{project_name}_x64-linux" + project_path = f"{project_name}_{ARCH_OS}" target_directory = VCPKG_LOCATION / "packages" / project_path return exec_explorer(target_directory)