From 7b1d730ddf8f49f05ed06f2671b6c40d5b115fd8 Mon Sep 17 00:00:00 2001
From: Max Heller <max.a.heller@gmail.com>
Date: Sat, 25 Nov 2023 08:53:09 -0500
Subject: [PATCH] npm run prepare

---
 dist/restore/index.js | 11 +++++++----
 dist/save/index.js    | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dist/restore/index.js b/dist/restore/index.js
index 42cc182..b79efc9 100644
--- a/dist/restore/index.js
+++ b/dist/restore/index.js
@@ -87018,11 +87018,11 @@ class Workspace {
         this.root = root;
         this.target = target;
     }
-    async getPackages() {
+    async getPackages(...extraArgs) {
         let packages = [];
         try {
             lib_core.debug(`collecting metadata for "${this.root}"`);
-            const meta = JSON.parse(await getCmdOutput("cargo", ["metadata", "--all-features", "--format-version", "1"], {
+            const meta = JSON.parse(await getCmdOutput("cargo", ["metadata", "--all-features", "--format-version", "1", ...extraArgs], {
                 cwd: this.root,
             }));
             lib_core.debug(`workspace "${this.root}" has ${meta.packages.length} packages`);
@@ -87152,7 +87152,8 @@ class CacheConfig {
         for (const workspace of workspaces) {
             const root = workspace.root;
             keyFiles.push(...(await globFiles(`${root}/**/.cargo/config.toml\n${root}/**/rust-toolchain\n${root}/**/rust-toolchain.toml`)));
-            const cargo_manifests = sort_and_uniq(await globFiles(`${root}/**/Cargo.toml`));
+            const workspaceMembers = await workspace.getPackages("--no-deps");
+            const cargo_manifests = sort_and_uniq(workspaceMembers.map(member => external_path_default().join(member.path, "Cargo.toml")));
             for (const cargo_manifest of cargo_manifests) {
                 try {
                     const content = await promises_default().readFile(cargo_manifest, { encoding: "utf8" });
@@ -87193,7 +87194,9 @@ class CacheConfig {
                     keyFiles.push(cargo_manifest);
                 }
             }
-            const cargo_locks = sort_and_uniq(await globFiles(`${root}/**/Cargo.lock`));
+            const cargo_locks = sort_and_uniq(workspaceMembers
+                .map(member => external_path_default().join(member.path, "Cargo.lock"))
+                .filter((external_fs_default()).existsSync));
             for (const cargo_lock of cargo_locks) {
                 try {
                     const content = await promises_default().readFile(cargo_lock, { encoding: "utf8" });
diff --git a/dist/save/index.js b/dist/save/index.js
index cb46c0a..dd98c61 100644
--- a/dist/save/index.js
+++ b/dist/save/index.js
@@ -87018,11 +87018,11 @@ class Workspace {
         this.root = root;
         this.target = target;
     }
-    async getPackages() {
+    async getPackages(...extraArgs) {
         let packages = [];
         try {
             core.debug(`collecting metadata for "${this.root}"`);
-            const meta = JSON.parse(await getCmdOutput("cargo", ["metadata", "--all-features", "--format-version", "1"], {
+            const meta = JSON.parse(await getCmdOutput("cargo", ["metadata", "--all-features", "--format-version", "1", ...extraArgs], {
                 cwd: this.root,
             }));
             core.debug(`workspace "${this.root}" has ${meta.packages.length} packages`);
@@ -87152,7 +87152,8 @@ class CacheConfig {
         for (const workspace of workspaces) {
             const root = workspace.root;
             keyFiles.push(...(await globFiles(`${root}/**/.cargo/config.toml\n${root}/**/rust-toolchain\n${root}/**/rust-toolchain.toml`)));
-            const cargo_manifests = sort_and_uniq(await globFiles(`${root}/**/Cargo.toml`));
+            const workspaceMembers = await workspace.getPackages("--no-deps");
+            const cargo_manifests = sort_and_uniq(workspaceMembers.map(member => external_path_default().join(member.path, "Cargo.toml")));
             for (const cargo_manifest of cargo_manifests) {
                 try {
                     const content = await promises_default().readFile(cargo_manifest, { encoding: "utf8" });
@@ -87193,7 +87194,9 @@ class CacheConfig {
                     keyFiles.push(cargo_manifest);
                 }
             }
-            const cargo_locks = sort_and_uniq(await globFiles(`${root}/**/Cargo.lock`));
+            const cargo_locks = sort_and_uniq(workspaceMembers
+                .map(member => external_path_default().join(member.path, "Cargo.lock"))
+                .filter((external_fs_default()).existsSync));
             for (const cargo_lock of cargo_locks) {
                 try {
                     const content = await promises_default().readFile(cargo_lock, { encoding: "utf8" });