From 827b33fbd09181e06e043dec7848b7c83e049627 Mon Sep 17 00:00:00 2001 From: Arpad Borsos Date: Sat, 9 Jul 2022 15:51:45 +0200 Subject: [PATCH] pretty printing and fix workspace package retrieval --- dist/restore/index.js | 11 ++++++++--- dist/save/index.js | 13 +++++++++---- src/config.ts | 2 ++ src/restore.ts | 5 +++-- src/save.ts | 7 ++++--- src/workspace.ts | 4 +++- 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dist/restore/index.js b/dist/restore/index.js index ecb115c..f033acf 100644 --- a/dist/restore/index.js +++ b/dist/restore/index.js @@ -61642,7 +61642,9 @@ class Workspace { async getPackages() { let packages = []; try { - 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"], { + cwd: this.root, + })); for (const pkg of meta.packages) { if (!pkg.manifest_path.startsWith(this.root)) { continue; @@ -61809,6 +61811,7 @@ class CacheConfig { return self; } printInfo() { + lib_core.startGroup("Cache Configuration"); lib_core.info(`Workspaces:`); for (const workspace of this.workspaces) { lib_core.info(` ${workspace.root}`); @@ -61832,6 +61835,7 @@ class CacheConfig { for (const file of this.keyFiles) { lib_core.info(` - ${file}`); } + lib_core.endGroup(); } async getCargoBins() { const bins = new Set(); @@ -62023,10 +62027,11 @@ async function run() { lib_core.exportVariable("CACHE_ON_FAILURE", cacheOnFailure); lib_core.exportVariable("CARGO_INCREMENTAL", 0); const config = await CacheConfig["new"](); + config.printInfo(); + lib_core.info(""); const bins = await config.getCargoBins(); lib_core.saveState(config_STATE_BINS, JSON.stringify([...bins])); - lib_core.info(`# Restoring cache`); - config.printInfo(); + lib_core.info(`... Restoring cache ...`); const key = config.cacheKey; const restoreKey = await cache.restoreCache(config.cachePaths, key, [config.restoreKey]); if (restoreKey) { diff --git a/dist/save/index.js b/dist/save/index.js index e7c4e8d..1906509 100644 --- a/dist/save/index.js +++ b/dist/save/index.js @@ -61642,7 +61642,9 @@ class Workspace { async getPackages() { let packages = []; try { - 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"], { + cwd: this.root, + })); for (const pkg of meta.packages) { if (!pkg.manifest_path.startsWith(this.root)) { continue; @@ -61809,6 +61811,7 @@ class CacheConfig { return self; } printInfo() { + core.startGroup("Cache Configuration"); core.info(`Workspaces:`); for (const workspace of this.workspaces) { core.info(` ${workspace.root}`); @@ -61832,6 +61835,7 @@ class CacheConfig { for (const file of this.keyFiles) { core.info(` - ${file}`); } + core.endGroup(); } async getCargoBins() { const bins = new Set(); @@ -62019,14 +62023,15 @@ async function run() { } try { const config = await CacheConfig["new"](); + config.printInfo(); + core.info(""); if (core.getState(STATE_KEY) === config.cacheKey) { core.info(`Cache up-to-date.`); return; } // TODO: remove this once https://github.com/actions/toolkit/pull/553 lands await macOsWorkaround(); - core.info(`# Cleaning Cache`); - config.printInfo(); + core.info(`... Cleaning Cache ...`); const registryName = await getRegistryName(config); const allPackages = []; for (const workspace of config.workspaces) { @@ -62059,7 +62064,7 @@ async function run() { catch (e) { core.info(`[warning] ${e.stack}`); } - core.info(`# Saving cache`); + core.info(`... Saving cache ...`); await cache.saveCache(config.cachePaths, config.cacheKey); } catch (e) { diff --git a/src/config.ts b/src/config.ts index c8379e4..514f755 100644 --- a/src/config.ts +++ b/src/config.ts @@ -180,6 +180,7 @@ export class CacheConfig { } printInfo() { + core.startGroup("Cache Configuration"); core.info(`Workspaces:`); for (const workspace of this.workspaces) { core.info(` ${workspace.root}`); @@ -203,6 +204,7 @@ export class CacheConfig { for (const file of this.keyFiles) { core.info(` - ${file}`); } + core.endGroup(); } public async getCargoBins(): Promise> { diff --git a/src/restore.ts b/src/restore.ts index 2716077..bd457a8 100644 --- a/src/restore.ts +++ b/src/restore.ts @@ -26,12 +26,13 @@ async function run() { core.exportVariable("CARGO_INCREMENTAL", 0); const config = await CacheConfig.new(); + config.printInfo(); + core.info(""); const bins = await config.getCargoBins(); core.saveState(STATE_BINS, JSON.stringify([...bins])); - core.info(`# Restoring cache`); - config.printInfo(); + core.info(`... Restoring cache ...`); const key = config.cacheKey; const restoreKey = await cache.restoreCache(config.cachePaths, key, [config.restoreKey]); if (restoreKey) { diff --git a/src/save.ts b/src/save.ts index 8427e98..d985999 100644 --- a/src/save.ts +++ b/src/save.ts @@ -21,6 +21,8 @@ async function run() { try { const config = await CacheConfig.new(); + config.printInfo(); + core.info(""); if (core.getState(STATE_KEY) === config.cacheKey) { core.info(`Cache up-to-date.`); @@ -30,8 +32,7 @@ async function run() { // TODO: remove this once https://github.com/actions/toolkit/pull/553 lands await macOsWorkaround(); - core.info(`# Cleaning Cache`); - config.printInfo(); + core.info(`... Cleaning Cache ...`); const registryName = await getRegistryName(config); @@ -66,7 +67,7 @@ async function run() { core.info(`[warning] ${(e as any).stack}`); } - core.info(`# Saving cache`); + core.info(`... Saving cache ...`); await cache.saveCache(config.cachePaths, config.cacheKey); } catch (e) { core.info(`[warning] ${(e as any).stack}`); diff --git a/src/workspace.ts b/src/workspace.ts index cd2865b..0f81eb9 100644 --- a/src/workspace.ts +++ b/src/workspace.ts @@ -9,7 +9,9 @@ export class Workspace { let packages: Packages = []; try { const meta: Meta = JSON.parse( - await getCmdOutput("cargo", ["metadata", "--all-features", "--format-version", "1"]), + await getCmdOutput("cargo", ["metadata", "--all-features", "--format-version", "1"], { + cwd: this.root, + }), ); for (const pkg of meta.packages) { if (!pkg.manifest_path.startsWith(this.root)) {