mirrors/rust-cache
3
0
Fork 0
mirror of https://github.com/Swatinem/rust-cache synced 2025-04-28 14:15:54 +00:00
Code Activity

Allow opting out of caching CARGO_HOME/bin.

Browse source 
Prevents wiping the bin directory, which is harmful for
self-hosted runners.
This commit is contained in:
Benjy Weinberger 2022-10-12 17:21:17 -07:00
parent 8f842c2d45
commit 5ed697a689
5 changed files with 69 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
dist/save/index.js vendored
View file

@ -88227,6 +88227,8 @@ class CacheConfig {
this.cacheKey = "";
/** The secondary (restore) key that only contains the prefix and environment */
this.restoreKey = "";
/** Whether to cache CARGO_HOME/.bin */
this.cacheBin = true;
/** The workspace configurations */
this.workspaces = [];
/** The cargo binaries present during main step */
@ -88299,6 +88301,7 @@ class CacheConfig {
// Construct the lockfiles portion of the key:
// This considers all the files found via globbing for various manifests
// and lockfiles.
self.cacheBin = core.getInput("cache-bin").toLowerCase() == "true";
// Constructs the workspace config and paths to restore:
// The workspaces are given using a `$workspace -> $target` syntax.
const workspaces = [];
@ -88393,7 +88396,19 @@ class CacheConfig {
self.keyFiles = sort_and_uniq(keyFiles);
key += `-${lockHash}`;
self.cacheKey = key;
self.cachePaths = [CARGO_HOME];
// The original action (https://github.com/Swatinem/rust-cache) cached the entire CARGO_HOME,
// but cleaned out CARGO_HOME/bin of all binaries that weren't built by the CI run itself.
// This had the unfortunate side-effect of nuking rustup/cargo/rustc etc from self-hosted runners.
// (This is usually not a problem on hosted runners, since you get a fresh container on each run).
// So we edit this action to not cache bin/, and to bypass cleaning that directory out.
// TODO: Create an upstream patch for this, controlled by an option.
self.cachePaths = [
external_path_default().join(CARGO_HOME, "registry"),
external_path_default().join(CARGO_HOME, "git"),
];
if (self.cacheBin) {
self.cachePaths = [external_path_default().join(CARGO_HOME, "bin"), ...self.cachePaths];
}
const cacheTargets = core.getInput("cache-targets").toLowerCase() || "true";
if (cacheTargets === "true") {
self.cachePaths.push(...workspaces.map((ws) => ws.target));
@ -88855,12 +88870,14 @@ async function run() {
catch (e) {
core.debug(`${e.stack}`);
}
try {
core.info(`... Cleaning cargo/bin ...`);
await cleanBin(config.cargoBins);
}
catch (e) {
core.debug(`${e.stack}`);
if (config.cacheBin) {
try {
core.info(`... Cleaning cargo/bin ...`);
await cleanBin(config.cargoBins);
}
catch (e) {
core.debug(`${e.stack}`);
}
}
try {
core.info(`... Cleaning cargo git cache ...`);