From 83aad8d470f3c15ca6b6c00be48d1d22706e4d4a Mon Sep 17 00:00:00 2001
From: Arpad Borsos <arpad.borsos@googlemail.com>
Date: Thu, 28 Jan 2021 18:42:00 +0100
Subject: [PATCH] rebuild

---
 dist/restore/index.js | 32 +++++++++++++++++++++++---------
 dist/save/index.js    | 28 ++++++++++++++++++----------
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/dist/restore/index.js b/dist/restore/index.js
index 30e5776..cc978e8 100644
--- a/dist/restore/index.js
+++ b/dist/restore/index.js
@@ -55713,10 +55713,11 @@ if (cwd) {
 const stateKey = "RUST_CACHE_KEY";
 const stateHash = "RUST_CACHE_HASH";
 const home = external_os_default().homedir();
+const cargoHome = process.env.CARGO_HOME || external_path_default().join(home, ".cargo");
 const paths = {
-    index: external_path_default().join(home, ".cargo/registry/index"),
-    cache: external_path_default().join(home, ".cargo/registry/cache"),
-    git: external_path_default().join(home, ".cargo/git"),
+    index: external_path_default().join(cargoHome, "registry/index"),
+    cache: external_path_default().join(cargoHome, "registry/cache"),
+    git: external_path_default().join(cargoHome, "git"),
     target: "target",
 };
 const RefKey = "GITHUB_REF";
@@ -55730,13 +55731,19 @@ async function getCacheConfig() {
         core.saveState(stateHash, lockHash);
     }
     let key = `v0-rust-`;
-    let inputKey = core.getInput("key");
-    if (inputKey) {
-        key += `${inputKey}-`;
+    const sharedKey = core.getInput("sharedKey");
+    if (sharedKey) {
+        key += `${sharedKey}-`;
     }
-    const job = process.env.GITHUB_JOB;
-    if (job) {
-        key += `${job}-`;
+    else {
+        const inputKey = core.getInput("key");
+        if (inputKey) {
+            key += `${inputKey}-`;
+        }
+        const job = process.env.GITHUB_JOB;
+        if (job) {
+            key += `${job}-`;
+        }
     }
     key += await getRustKey();
     return {
@@ -55858,6 +55865,7 @@ async function run() {
         core.exportVariable("CARGO_INCREMENTAL", 0);
         const { paths, key, restoreKeys } = await getCacheConfig();
         core.info(`Restoring paths:\n    ${paths.join("\n    ")}`);
+        core.info(`In directory:\n    ${process.cwd()}`);
         core.info(`Using keys:\n    ${[key, ...restoreKeys].join("\n    ")}`);
         const restoreKey = await cache.restoreCache(paths, key, restoreKeys);
         if (restoreKey) {
@@ -55868,15 +55876,21 @@ async function run() {
                 const packages = await getPackages();
                 await cleanTarget(packages);
             }
+            setCacheHitOutput(restoreKey === key);
         }
         else {
             core.info("No cache found.");
+            setCacheHitOutput(false);
         }
     }
     catch (e) {
+        setCacheHitOutput(false);
         core.info(`[warning] ${e.message}`);
     }
 }
+function setCacheHitOutput(cacheHit) {
+    core.setOutput("cache-hit", cacheHit.toString());
+}
 run();
 
 
diff --git a/dist/save/index.js b/dist/save/index.js
index d5a9cce..c029c73 100644
--- a/dist/save/index.js
+++ b/dist/save/index.js
@@ -55713,10 +55713,11 @@ if (cwd) {
 const stateKey = "RUST_CACHE_KEY";
 const stateHash = "RUST_CACHE_HASH";
 const home = external_os_default().homedir();
+const cargoHome = process.env.CARGO_HOME || external_path_default().join(home, ".cargo");
 const paths = {
-    index: external_path_default().join(home, ".cargo/registry/index"),
-    cache: external_path_default().join(home, ".cargo/registry/cache"),
-    git: external_path_default().join(home, ".cargo/git"),
+    index: external_path_default().join(cargoHome, "registry/index"),
+    cache: external_path_default().join(cargoHome, "registry/cache"),
+    git: external_path_default().join(cargoHome, "git"),
     target: "target",
 };
 const RefKey = "GITHUB_REF";
@@ -55730,13 +55731,19 @@ async function getCacheConfig() {
         core.saveState(stateHash, lockHash);
     }
     let key = `v0-rust-`;
-    let inputKey = core.getInput("key");
-    if (inputKey) {
-        key += `${inputKey}-`;
+    const sharedKey = core.getInput("sharedKey");
+    if (sharedKey) {
+        key += `${sharedKey}-`;
     }
-    const job = process.env.GITHUB_JOB;
-    if (job) {
-        key += `${job}-`;
+    else {
+        const inputKey = core.getInput("key");
+        if (inputKey) {
+            key += `${inputKey}-`;
+        }
+        const job = process.env.GITHUB_JOB;
+        if (job) {
+            key += `${job}-`;
+        }
     }
     key += await getRustKey();
     return {
@@ -55882,7 +55889,8 @@ async function run() {
         }
         catch { }
         core.info(`Saving paths:\n    ${savePaths.join("\n    ")}`);
-        core.info(`Using key "${key}".`);
+        core.info(`In directory:\n    ${process.cwd()}`);
+        core.info(`Using key:\n    ${key}`);
         await cache.saveCache(savePaths, key);
     }
     catch (e) {