2.6.1

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>

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.6.1
+
+- Fix hash contributions of `Cargo.lock`/`Cargo.toml` files.
+
 ## 2.6.0
 
 - Add "buildjet" as a second `cache-provider` backend.

dist/restore/index.js

@@ -67021,16 +67021,24 @@ class CacheConfig {
                         const deps = parsed[section_name];
                         for (const key of Object.keys(deps)) {
                             const dep = deps[key];
-                            if ("path" in dep) {
+                            try {
-                                dep.version = "0.0.0";
+                                if ("path" in dep) {
+                                    dep.version = "0.0.0";
+                                    dep.path = "";
+                                }
+                            }
+                            catch (_e) {
+                                // Not an object, probably a string (version),
+                                // continue.
+                                continue;
                             }
                         }
                     }
                     hasher.update(JSON.stringify(parsed));
                     parsedKeyFiles.push(cargo_manifest);
                 }
-                catch (_e) {
+                catch (e) { // Fallback to caching them as regular file
-                    // Fallback to caching them as regular file
+                    lib_core.warning(`Error parsing Cargo.toml manifest, fallback to caching entire file: ${e}`);
                     keyFiles.push(cargo_manifest);
                 }
             }
@@ -67042,19 +67050,18 @@ class CacheConfig {
                     if (parsed.version !== 3 || !("package" in parsed)) {
                         // Fallback to caching them as regular file since this action
                         // can only handle Cargo.lock format version 3
+                        lib_core.warning('Unsupported Cargo.lock format, fallback to caching entire file');
                         keyFiles.push(cargo_lock);
                         continue;
                     }
                     // Package without `[[package]].source` and `[[package]].checksum`
                     // are the one with `path = "..."` to crates within the workspace.
-                    const packages = parsed.package.filter((p) => {
+                    const packages = parsed.package.filter((p) => "source" in p || "checksum" in p);
-                        "source" in p || "checksum" in p;
-                    });
                     hasher.update(JSON.stringify(packages));
                     parsedKeyFiles.push(cargo_lock);
                 }
-                catch (_e) {
+                catch (e) { // Fallback to caching them as regular file
-                    // Fallback to caching them as regular file
+                    lib_core.warning(`Error parsing Cargo.lock manifest, fallback to caching entire file: ${e}`);
                     keyFiles.push(cargo_lock);
                 }
             }

dist/save/index.js

@@ -67021,16 +67021,24 @@ class CacheConfig {
                         const deps = parsed[section_name];
                         for (const key of Object.keys(deps)) {
                             const dep = deps[key];
-                            if ("path" in dep) {
+                            try {
-                                dep.version = "0.0.0";
+                                if ("path" in dep) {
+                                    dep.version = "0.0.0";
+                                    dep.path = "";
+                                }
+                            }
+                            catch (_e) {
+                                // Not an object, probably a string (version),
+                                // continue.
+                                continue;
                             }
                         }
                     }
                     hasher.update(JSON.stringify(parsed));
                     parsedKeyFiles.push(cargo_manifest);
                 }
-                catch (_e) {
+                catch (e) { // Fallback to caching them as regular file
-                    // Fallback to caching them as regular file
+                    core.warning(`Error parsing Cargo.toml manifest, fallback to caching entire file: ${e}`);
                     keyFiles.push(cargo_manifest);
                 }
             }
@@ -67042,19 +67050,18 @@ class CacheConfig {
                     if (parsed.version !== 3 || !("package" in parsed)) {
                         // Fallback to caching them as regular file since this action
                         // can only handle Cargo.lock format version 3
+                        core.warning('Unsupported Cargo.lock format, fallback to caching entire file');
                         keyFiles.push(cargo_lock);
                         continue;
                     }
                     // Package without `[[package]].source` and `[[package]].checksum`
                     // are the one with `path = "..."` to crates within the workspace.
-                    const packages = parsed.package.filter((p) => {
+                    const packages = parsed.package.filter((p) => "source" in p || "checksum" in p);
-                        "source" in p || "checksum" in p;
-                    });
                     hasher.update(JSON.stringify(packages));
                     parsedKeyFiles.push(cargo_lock);
                 }
-                catch (_e) {
+                catch (e) { // Fallback to caching them as regular file
-                    // Fallback to caching them as regular file
+                    core.warning(`Error parsing Cargo.lock manifest, fallback to caching entire file: ${e}`);
                     keyFiles.push(cargo_lock);
                 }
             }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "rust-cache",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "rust-cache",
-      "version": "2.6.0",
+      "version": "2.6.1",
       "license": "LGPL-3.0",
       "dependencies": {
         "@actions/buildjet-cache": "npm:github-actions.cache-buildjet@0.1.2",

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "rust-cache",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "A GitHub Action that implements smart caching for rust/cargo projects with sensible defaults.",
   "keywords": [
     "actions",

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) {
+              try {
-                dep.version = "0.0.0";
+                if ("path" in dep) {
+                  dep.version = "0.0.0";
+                  dep.path = "";
+                }
+              } catch (_e) {
+                // Not an object, probably a string (version),
+                // continue.
+                continue;
               }
             }
           }
@@ -175,8 +182,8 @@ export class CacheConfig {
           hasher.update(JSON.stringify(parsed));
 
           parsedKeyFiles.push(cargo_manifest);
-        } catch (_e) {
+        } catch (e) { // Fallback to caching them as regular file
-          // Fallback to caching them as regular file
+          core.warning(`Error parsing Cargo.toml manifest, fallback to caching entire file: ${e}`);
           keyFiles.push(cargo_manifest);
         }
       }
@@ -191,21 +198,20 @@ export class CacheConfig {
           if (parsed.version !== 3 || !("package" in parsed)) {
             // Fallback to caching them as regular file since this action
             // can only handle Cargo.lock format version 3
+            core.warning('Unsupported Cargo.lock format, fallback to caching entire file');
             keyFiles.push(cargo_lock);
             continue;
           }
 
           // Package without `[[package]].source` and `[[package]].checksum`
           // are the one with `path = "..."` to crates within the workspace.
-          const packages = parsed.package.filter((p: any) => {
+          const packages = parsed.package.filter((p: any) => "source" in p || "checksum" in p);
-            "source" in p || "checksum" in p;
-          });
 
           hasher.update(JSON.stringify(packages));
 
           parsedKeyFiles.push(cargo_lock);
-        } catch (_e) {
+        } catch (e) { // Fallback to caching them as regular file
-          // Fallback to caching them as regular file
+          core.warning(`Error parsing Cargo.lock manifest, fallback to caching entire file: ${e}`);
           keyFiles.push(cargo_lock);
         }
       }