fix: cortex-cpp node prebuild dependencies

janhq · Jul 13, 2024 · 58ca854 · 58ca854
1 parent 7052afa
commit 58ca854
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/cortex-build.yml b/.github/workflows/cortex-build.yml
@@ -218,7 +218,7 @@ jobs:
 
   build-cortex-single-binary:
     runs-on: ${{ matrix.runs-on }}
-    needs: [create-draft-release]
+    needs: [create-draft-release, build-and-test]
     timeout-minutes: 20
     strategy:
       fail-fast: false

diff --git a/cortex-cpp/package.json b/cortex-cpp/package.json
@@ -12,7 +12,7 @@
     "install": "prebuild-install --runtime napi --backend cmake-js --config Release || cmake-js rebuild --config Release",
     "build": "cmake-js configure --config Release && cmake-js build --config Release",
     "rebuild": "cmake-js rebuild --config Release",
-    "prebuild": "prebuild --runtime napi --backend cmake-js --all --strip --verbose --config Release",
+    "prebuild": "prebuild --runtime napi --backend cmake-js --all --strip --verbose --config Release --include-regex \"\\.(node|exp|lib|so)$\"",
     "upload": "prebuild --runtime napi --backend cmake-js --upload ${GITHUB_TOKEN}"
   },
   "author": "Jan <[email protected]>",

diff --git a/cortex-js/src/infrastructure/commanders/usecases/init.cli.usecases.ts b/cortex-js/src/infrastructure/commanders/usecases/init.cli.usecases.ts
@@ -88,9 +88,7 @@ export class InitCliUsecases {
             ? '-mac'
             : '-linux',
         // CPU Instructions - CPU | GPU Non-Vulkan
-        options?.instructions &&
-        (options?.runMode === 'CPU' ||
-          (options?.runMode === 'GPU' && !isVulkan))
+        options?.instructions && !isVulkan
           ? `-${options?.instructions?.toLowerCase()}`
           : '',
         // Cuda
@@ -225,11 +223,10 @@ export class InitCliUsecases {
 
     let release = res?.data;
     if (Array.isArray(res?.data)) {
-      release = Array(res?.data)[0].find(
-        (e) => e.name === version.replace('v', ''),
-      );
+      release = Array(res?.data)[0]
+        .sort((a, b) => a.name.length - b.name.length) // Sort by length, sortest first - for matching accuracy
+        .find((e) => e.name === version.replace('v', ''));
     }
-
     // Find the asset for the current platform
     const toDownloadAsset = release.assets.find((asset: any) =>
       matchers.every((matcher) => asset.name.includes(matcher)),