From 36af5cb1ae242cc28b6ba47fcc59177c4831eb58 Mon Sep 17 00:00:00 2001
From: Arpad Borsos <swatinem@swatinem.de>
Date: Sat, 9 Jul 2022 15:39:43 +0200
Subject: [PATCH] fix pretty printing and selftest

---
 .github/workflows/selftest.yml | 4 ++--
 dist/restore/index.js          | 5 +++--
 dist/save/index.js             | 8 +++++---
 src/save.ts                    | 4 +++-
 src/utils.ts                   | 3 ++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/selftest.yml b/.github/workflows/selftest.yml
index 809d776..cf86383 100644
--- a/.github/workflows/selftest.yml
+++ b/.github/workflows/selftest.yml
@@ -21,7 +21,7 @@ jobs:
 
       - uses: ./
         with:
-          workspace-paths: tests
+          workspaces: tests
 
       - run: |
           cargo check
@@ -66,7 +66,7 @@ jobs:
 
       - uses: ./
         with:
-          workspace-paths: |
+          workspaces: |
             tests
             tests/wasm-workspace
 
diff --git a/dist/restore/index.js b/dist/restore/index.js
index b0ca432..ecb115c 100644
--- a/dist/restore/index.js
+++ b/dist/restore/index.js
@@ -61624,7 +61624,8 @@ async function getCmdOutput(cmd, args = [], options = {}) {
         });
     }
     catch (e) {
-        lib_core.error(stderr);
+        lib_core.info(`[warning] Command failed: ${cmd} ${args.join(" ")}`);
+        lib_core.info(`[warning] ${stderr}`);
         throw e;
     }
     return stdout;
@@ -61736,7 +61737,7 @@ class CacheConfig {
         self.keyRust = keyRust;
         // these prefixes should cover most of the compiler / rust / cargo keys
         const envPrefixes = ["CARGO", "CC", "CXX", "CMAKE", "RUST"];
-        envPrefixes.push(...lib_core.getInput("envVars").split(/\s+/));
+        envPrefixes.push(...lib_core.getInput("envVars").split(/\s+/).filter(Boolean));
         // sort the available env vars so we have a more stable hash
         const keyEnvs = [];
         const envKeys = Object.keys(process.env);
diff --git a/dist/save/index.js b/dist/save/index.js
index 4e1eb3d..e7c4e8d 100644
--- a/dist/save/index.js
+++ b/dist/save/index.js
@@ -61624,7 +61624,8 @@ async function getCmdOutput(cmd, args = [], options = {}) {
         });
     }
     catch (e) {
-        core.error(stderr);
+        core.info(`[warning] Command failed: ${cmd} ${args.join(" ")}`);
+        core.info(`[warning] ${stderr}`);
         throw e;
     }
     return stdout;
@@ -61736,7 +61737,7 @@ class CacheConfig {
         self.keyRust = keyRust;
         // these prefixes should cover most of the compiler / rust / cargo keys
         const envPrefixes = ["CARGO", "CC", "CXX", "CMAKE", "RUST"];
-        envPrefixes.push(...core.getInput("envVars").split(/\s+/));
+        envPrefixes.push(...core.getInput("envVars").split(/\s+/).filter(Boolean));
         // sort the available env vars so we have a more stable hash
         const keyEnvs = [];
         const envKeys = Object.keys(process.env);
@@ -62024,6 +62025,8 @@ async function run() {
         }
         // TODO: remove this once https://github.com/actions/toolkit/pull/553 lands
         await macOsWorkaround();
+        core.info(`# Cleaning Cache`);
+        config.printInfo();
         const registryName = await getRegistryName(config);
         const allPackages = [];
         for (const workspace of config.workspaces) {
@@ -62057,7 +62060,6 @@ async function run() {
             core.info(`[warning] ${e.stack}`);
         }
         core.info(`# Saving cache`);
-        config.printInfo();
         await cache.saveCache(config.cachePaths, config.cacheKey);
     }
     catch (e) {
diff --git a/src/save.ts b/src/save.ts
index 20e23c3..8427e98 100644
--- a/src/save.ts
+++ b/src/save.ts
@@ -30,6 +30,9 @@ async function run() {
     // TODO: remove this once https://github.com/actions/toolkit/pull/553 lands
     await macOsWorkaround();
 
+    core.info(`# Cleaning Cache`);
+    config.printInfo();
+
     const registryName = await getRegistryName(config);
 
     const allPackages = [];
@@ -64,7 +67,6 @@ async function run() {
     }
 
     core.info(`# Saving cache`);
-    config.printInfo();
     await cache.saveCache(config.cachePaths, config.cacheKey);
   } catch (e) {
     core.info(`[warning] ${(e as any).stack}`);
diff --git a/src/utils.ts b/src/utils.ts
index e9f7d97..1d00a15 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -22,7 +22,8 @@ export async function getCmdOutput(
       ...options,
     });
   } catch (e) {
-    core.error(stderr);
+    core.info(`[warning] Command failed: ${cmd} ${args.join(" ")}`);
+    core.info(`[warning] ${stderr}`);
     throw e;
   }
   return stdout;