wip

expo · Sep 13, 2023 · c0e3f8f · c0e3f8f
1 parent e5292ca
commit c0e3f8f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/build/fingerprint-post/index.js b/build/fingerprint-post/index.js
@@ -77687,19 +77687,14 @@ async function installSQLiteAsync(packager) {
     const message = `Installing ${packageName} (${version}) from cache or with ${packager}`;
     return await (0,core.group)(message, async () => {
         let libRoot = (0,tool_cache.find)(packageName, version) || null;
-        console.log('ooxx0', libRoot);
         if (!libRoot) {
             libRoot = await restoreFromCache(packageName, version, packager);
         }
-        console.log('ooxx1', libRoot);
         if (!libRoot) {
             libRoot = await installPackage(packageName, version, packager);
             await saveToCache(packageName, version, packager);
         }
-        console.log('ooxx2', libRoot);
-        const { stdout } = await (0,lib_exec.getExecOutput)('find', [libRoot, '-ls']);
-        console.log('ooxx stdout', stdout);
-        addGlobalNodeSearchPath(libRoot);
+        addGlobalNodeSearchPath(external_path_default().join(libRoot, 'node_modules'));
         return libRoot;
     });
 }

diff --git a/build/fingerprint/index.js b/build/fingerprint/index.js
@@ -77690,19 +77690,14 @@ async function installSQLiteAsync(packager) {
     const message = `Installing ${packageName} (${version}) from cache or with ${packager}`;
     return await (0,core.group)(message, async () => {
         let libRoot = (0,tool_cache.find)(packageName, version) || null;
-        console.log('ooxx0', libRoot);
         if (!libRoot) {
             libRoot = await restoreFromCache(packageName, version, packager);
         }
-        console.log('ooxx1', libRoot);
         if (!libRoot) {
             libRoot = await installPackage(packageName, version, packager);
             await saveToCache(packageName, version, packager);
         }
-        console.log('ooxx2', libRoot);
-        const { stdout } = await (0,lib_exec.getExecOutput)('find', [libRoot, '-ls']);
-        console.log('ooxx stdout', stdout);
-        addGlobalNodeSearchPath(libRoot);
+        addGlobalNodeSearchPath(external_path_default().join(libRoot, 'node_modules'));
         return libRoot;
     });
 }

diff --git a/src/sqlite.ts b/src/sqlite.ts
@@ -1,6 +1,6 @@
 import { group } from '@actions/core';
-import { getExecOutput } from '@actions/exec';
 import assert from 'assert';
+import path from 'path';
 import type sqlite3Types from 'sqlite3';
 import { promisify } from 'util';
 
@@ -58,20 +58,15 @@ export async function installSQLiteAsync(packager: string): Promise<string> {
 
   return await group(message, async () => {
     let libRoot = findTool(packageName, version) || null;
-    console.log('ooxx0', libRoot);
     if (!libRoot) {
       libRoot = await restoreFromCache(packageName, version, packager);
     }
-    console.log('ooxx1', libRoot);
     if (!libRoot) {
       libRoot = await installPackage(packageName, version, packager);
       await saveToCache(packageName, version, packager);
     }
-    console.log('ooxx2', libRoot);
 
-    const { stdout } = await getExecOutput('find', [libRoot, '-ls']);
-    console.log('ooxx stdout', stdout);
-    addGlobalNodeSearchPath(libRoot);
+    addGlobalNodeSearchPath(path.join(libRoot, 'node_modules'));
     return libRoot;
   });
 }