mirrors/rust-cache
3
0
Fork 0
mirror of https://github.com/Swatinem/rust-cache synced 2025-04-05 21:24:07 +00:00
Code Activity

fix pretty printing and selftest

Browse source
This commit is contained in:
Arpad Borsos 2022-07-09 15:39:43 +02:00
parent cb43a50800
commit 36af5cb1ae
No known key found for this signature in database
GPG key ID: FC7BCA77824B3298
5 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/selftest.yml vendored
View file

@ -21,7 +21,7 @@ jobs:
- uses: ./ - uses: ./
with: with:
workspace-paths: tests workspaces: tests
- run: | - run: |
cargo check cargo check
@ -66,7 +66,7 @@ jobs:
- uses: ./ - uses: ./
with: with:
workspace-paths: | workspaces: |
tests tests
tests/wasm-workspace tests/wasm-workspace

5
dist/restore/index.js vendored
View file

@ -61624,7 +61624,8 @@ async function getCmdOutput(cmd, args = [], options = {}) {
}); });
} }
catch (e) { catch (e) {
lib_core.error(stderr); lib_core.info(`[warning] Command failed: ${cmd} ${args.join(" ")}`);
lib_core.info(`[warning] ${stderr}`);
throw e; throw e;
} }
return stdout; return stdout;
@ -61736,7 +61737,7 @@ class CacheConfig {
self.keyRust = keyRust; self.keyRust = keyRust;
// these prefixes should cover most of the compiler / rust / cargo keys // these prefixes should cover most of the compiler / rust / cargo keys
const envPrefixes = ["CARGO", "CC", "CXX", "CMAKE", "RUST"]; 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 // sort the available env vars so we have a more stable hash
const keyEnvs = []; const keyEnvs = [];
const envKeys = Object.keys(process.env); const envKeys = Object.keys(process.env);

8
dist/save/index.js vendored
View file

@ -61624,7 +61624,8 @@ async function getCmdOutput(cmd, args = [], options = {}) {
}); });
} }
catch (e) { catch (e) {
core.error(stderr); core.info(`[warning] Command failed: ${cmd} ${args.join(" ")}`);
core.info(`[warning] ${stderr}`);
throw e; throw e;
} }
return stdout; return stdout;
@ -61736,7 +61737,7 @@ class CacheConfig {
self.keyRust = keyRust; self.keyRust = keyRust;
// these prefixes should cover most of the compiler / rust / cargo keys // these prefixes should cover most of the compiler / rust / cargo keys
const envPrefixes = ["CARGO", "CC", "CXX", "CMAKE", "RUST"]; 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 // sort the available env vars so we have a more stable hash
const keyEnvs = []; const keyEnvs = [];
const envKeys = Object.keys(process.env); 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 // TODO: remove this once https://github.com/actions/toolkit/pull/553 lands
await macOsWorkaround(); await macOsWorkaround();
core.info(`# Cleaning Cache`);
config.printInfo();
const registryName = await getRegistryName(config); const registryName = await getRegistryName(config);
const allPackages = []; const allPackages = [];
for (const workspace of config.workspaces) { for (const workspace of config.workspaces) {
@ -62057,7 +62060,6 @@ async function run() {
core.info(`[warning] ${e.stack}`); core.info(`[warning] ${e.stack}`);
} }
core.info(`# Saving cache`); core.info(`# Saving cache`);
config.printInfo();
await cache.saveCache(config.cachePaths, config.cacheKey); await cache.saveCache(config.cachePaths, config.cacheKey);
} }
catch (e) { catch (e) {

4
src/save.ts
View file

@ -30,6 +30,9 @@ async function run() {
// TODO: remove this once https://github.com/actions/toolkit/pull/553 lands // TODO: remove this once https://github.com/actions/toolkit/pull/553 lands
await macOsWorkaround(); await macOsWorkaround();
core.info(`# Cleaning Cache`);
config.printInfo();
const registryName = await getRegistryName(config); const registryName = await getRegistryName(config);
const allPackages = []; const allPackages = [];
@ -64,7 +67,6 @@ async function run() {
} }
core.info(`# Saving cache`); core.info(`# Saving cache`);
config.printInfo();
await cache.saveCache(config.cachePaths, config.cacheKey); await cache.saveCache(config.cachePaths, config.cacheKey);
} catch (e) { } catch (e) {
core.info(`[warning] ${(e as any).stack}`); core.info(`[warning] ${(e as any).stack}`);

3
src/utils.ts
View file

@ -22,7 +22,8 @@ export async function getCmdOutput(
...options, ...options,
}); });
} catch (e) { } catch (e) {
core.error(stderr); core.info(`[warning] Command failed: ${cmd} ${args.join(" ")}`);
core.info(`[warning] ${stderr}`);
throw e; throw e;
} }
return stdout; return stdout;