Actions/rust-cache
1
Fork 0
mirror of https://github.com/Swatinem/rust-cache.git synced 2025-08-14 20:55:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

also search for rust-toolchain files on each workspace

Browse Source
This commit is contained in:
Lucas Nogueira 2022-11-05 16:19:47 -03:00
parent 4b699461db
commit df5298f6e0
No known key found for this signature in database
GPG Key ID: FFEA6C72E73482F1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/config.ts
View File

@ -36,7 +36,7 @@ export class CacheConfig {
/** The files considered for the cache key */ /** The files considered for the cache key */
private keyFiles: Array<string> = []; private keyFiles: Array<string> = [];
private constructor() { } private constructor() {}
/** /**
* Constructs a [`CacheConfig`] with all the paths and keys. * Constructs a [`CacheConfig`] with all the paths and keys.
@ -116,6 +116,7 @@ export class CacheConfig {
// might create/overwrite lockfiles. // might create/overwrite lockfiles.
let lockHash = core.getState(STATE_LOCKFILE_HASH); let lockHash = core.getState(STATE_LOCKFILE_HASH);
let keyFiles: Array<string> = JSON.parse(core.getState(STATE_LOCKFILES) || "[]");
// Constructs the workspace config and paths to restore: // Constructs the workspace config and paths to restore:
// The workspaces are given using a `$workspace -> $target` syntax. // The workspaces are given using a `$workspace -> $target` syntax.
@ -130,8 +131,6 @@ export class CacheConfig {
} }
self.workspaces = workspaces; self.workspaces = workspaces;
let keyFiles: Array<string> = JSON.parse(core.getState(STATE_LOCKFILES) || "[]");
if (!lockHash) { if (!lockHash) {
hasher = crypto.createHash("sha1"); hasher = crypto.createHash("sha1");
@ -145,7 +144,7 @@ export class CacheConfig {
keyFiles = keyFiles.concat(await globHash("rust-toolchain\nrust-toolchain.toml")); keyFiles = keyFiles.concat(await globHash("rust-toolchain\nrust-toolchain.toml"));
for (const workspace of workspaces) { for (const workspace of workspaces) {
const root = workspace.root; const root = workspace.root;
keyFiles = keyFiles.concat(await globHash(`${root}/**/Cargo.toml\n${root}/**/Cargo.lock`)); keyFiles = keyFiles.concat(await globHash(`${root}/**/Cargo.toml\n${root}/**/Cargo.lock\n${root}/**/rust-toolchain\n${root}/**/rust-toolchain.toml`));
} }
keyFiles.sort((a, b) => a.localeCompare(b)); keyFiles.sort((a, b) => a.localeCompare(b));