mirror of
https://github.com/Swatinem/rust-cache
synced 2025-04-05 05:04:07 +00:00
pretty printing and fix workspace package retrieval
This commit is contained in:
parent
36af5cb1ae
commit
827b33fbd0
11
dist/restore/index.js
vendored
11
dist/restore/index.js
vendored
|
@ -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) {
|
||||
|
|
13
dist/save/index.js
vendored
13
dist/save/index.js
vendored
|
@ -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) {
|
||||
|
|
|
@ -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<Set<string>> {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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}`);
|
||||
|
|
|
@ -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)) {
|
||||
|
|
Loading…
Reference in a new issue