Parse values from poetry

actions · Jan 31, 2022 · 0f8afe0 · 0f8afe0
1 parent b190eb8
commit 0f8afe0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -38663,7 +38663,7 @@ class PoetryCache extends cache_distributor_1.default {
             const cacheDir = poetryConfig['cache-dir'];
             const virtualenvsPath = poetryConfig['virtualenvs.path'].replace('{cache-dir}', cacheDir);
             const paths = [virtualenvsPath];
-            if (poetryConfig['virtualenvs.in-project'] === 'true') {
+            if (poetryConfig['virtualenvs.in-project'] === true) {
                 paths.push(path.join(process.cwd(), '.venv'));
             }
             return paths;
@@ -38695,7 +38695,7 @@ class PoetryCache extends cache_distributor_1.default {
             for (let line of lines) {
                 line = line.replace(/#.*$/, '');
                 const [key, value] = line.split('=').map(part => part.trim());
-                config[key] = value;
+                config[key] = JSON.parse(value);
             }
             return config;
         });

diff --git a/src/cache-distributions/poetry-cache.ts b/src/cache-distributions/poetry-cache.ts
@@ -24,7 +24,7 @@ class PoetryCache extends CacheDistributor {
 
     const paths = [virtualenvsPath];
 
-    if (poetryConfig['virtualenvs.in-project'] === 'true') {
+    if (poetryConfig['virtualenvs.in-project'] === true) {
       paths.push(path.join(process.cwd(), '.venv'));
     }
 
@@ -57,21 +57,21 @@ class PoetryCache extends CacheDistributor {
 
     const lines = stdout.trim().split(os.EOL);
 
-    const config = {} as {
-      'cache-dir': string;
-      'virtualenvs.in-project': string;
-      'virtualenvs.path': string;
-    };
+    const config: any = {};
 
     for (let line of lines) {
       line = line.replace(/#.*$/, '');
 
       const [key, value] = line.split('=').map(part => part.trim());
 
-      config[key as keyof typeof config] = value;
+      config[key] = JSON.parse(value);
     }
 
-    return config;
+    return config as {
+      'cache-dir': string;
+      'virtualenvs.in-project': boolean;
+      'virtualenvs.path': string;
+    };
   }
 }