Fix hashing of parsed Cargo.toml (#160)

The values for the dependencies could be strings intead of objects, so add a `try` block to take care of that. Also set `dep.path` to `""` if the dependency contains a key `path` to make sure that the cache isn't invalidated due to change in workspace. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
Swatinem · Aug 12, 2023 · c0e052c · c0e052c
1 parent 4e0f4b1
commit c0e052c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/dist/restore/index.js b/dist/restore/index.js
@@ -67021,8 +67021,16 @@ class CacheConfig {
                         const deps = parsed[section_name];
                         for (const key of Object.keys(deps)) {
                             const dep = deps[key];
-                            if ("path" in dep) {
-                                dep.version = "0.0.0";
+                            try {
+                                if ("path" in dep) {
+                                    dep.version = "0.0.0";
+                                    dep.path = "";
+                                }
+                            }
+                            catch (_e) {
+                                // Not an object, probably a string (version),
+                                // continue.
+                                continue;
                             }
                         }
                     }

diff --git a/dist/save/index.js b/dist/save/index.js
@@ -67021,8 +67021,16 @@ class CacheConfig {
                         const deps = parsed[section_name];
                         for (const key of Object.keys(deps)) {
                             const dep = deps[key];
-                            if ("path" in dep) {
-                                dep.version = "0.0.0";
+                            try {
+                                if ("path" in dep) {
+                                    dep.version = "0.0.0";
+                                    dep.path = "";
+                                }
+                            }
+                            catch (_e) {
+                                // Not an object, probably a string (version),
+                                // continue.
+                                continue;
                             }
                         }
                     }

diff --git a/src/config.ts b/src/config.ts
@@ -166,8 +166,15 @@ export class CacheConfig {
             for (const key of Object.keys(deps)) {
               const dep = deps[key];
 
-              if ("path" in dep) {
-                dep.version = "0.0.0";
+              try {
+                if ("path" in dep) {
+                  dep.version = "0.0.0";
+                  dep.path = "";
+                }
+              } catch (_e) {
+                // Not an object, probably a string (version),
+                // continue.
+                continue;
               }
             }
           }