Support Cargo.lock format cargo-lock v4 (#211)

Fixed #209 Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
Swatinem · Oct 8, 2024 · 8f842c2 · 8f842c2
1 parent 96a8d65
commit 8f842c2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dist/restore/index.js b/dist/restore/index.js
@@ -88363,7 +88363,7 @@ class CacheConfig {
                 try {
                     const content = await promises_default().readFile(cargo_lock, { encoding: "utf8" });
                     const parsed = parse(content);
-                    if (parsed.version !== 3 || !("package" in parsed)) {
+                    if ((parsed.version !== 3 && parsed.version !== 4) || !("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');

diff --git a/dist/save/index.js b/dist/save/index.js
@@ -88363,7 +88363,7 @@ class CacheConfig {
                 try {
                     const content = await promises_default().readFile(cargo_lock, { encoding: "utf8" });
                     const parsed = parse(content);
-                    if (parsed.version !== 3 || !("package" in parsed)) {
+                    if ((parsed.version !== 3 && parsed.version !== 4) || !("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');

diff --git a/src/config.ts b/src/config.ts
@@ -197,7 +197,7 @@ export class CacheConfig {
           const content = await fs_promises.readFile(cargo_lock, { encoding: "utf8" });
           const parsed = toml.parse(content);
 
-          if (parsed.version !== 3 || !("package" in parsed)) {
+          if ((parsed.version !== 3 && parsed.version !== 4) || !("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');