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

lol, dependency check was reversed

Browse source
This commit is contained in:
Arpad Borsos 2022-07-09 17:37:48 +02:00
parent 7c190ef171
commit 07a2ee71bc
No known key found for this signature in database
GPG key ID: FC7BCA77824B3298
5 changed files with 32 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dist/restore/index.js vendored
View file

@ -61646,7 +61646,7 @@ class Workspace {
cwd: this.root, cwd: this.root,
})); }));
for (const pkg of meta.packages) { for (const pkg of meta.packages) {
if (!pkg.manifest_path.startsWith(this.root)) { if (pkg.manifest_path.startsWith(this.root)) {
continue; continue;
} }
const targets = pkg.targets.filter((t) => t.kind[0] === "lib").map((t) => t.name); const targets = pkg.targets.filter((t) => t.kind[0] === "lib").map((t) => t.name);
@ -61875,7 +61875,7 @@ async function cleanTargetDir(targetDir, packages) {
if (dirent.isDirectory()) { if (dirent.isDirectory()) {
let dirName = external_path_default().join(dir.path, dirent.name); let dirName = external_path_default().join(dir.path, dirent.name);
// is it a profile dir, or a nested target dir? // is it a profile dir, or a nested target dir?
let isNestedTarget = await exists(external_path_default().join(dirName, "CACHEDIR.TAG")); let isNestedTarget = (await exists(external_path_default().join(dirName, "CACHEDIR.TAG"))) || (await exists(external_path_default().join(dirName, ".rustc_info.json")));
try { try {
if (isNestedTarget) { if (isNestedTarget) {
await cleanTargetDir(dirName, packages); await cleanTargetDir(dirName, packages);
@ -61891,19 +61891,10 @@ async function cleanTargetDir(targetDir, packages) {
} }
} }
await external_fs_default().promises.unlink(external_path_default().join(targetDir, "./.rustc_info.json")); await external_fs_default().promises.unlink(external_path_default().join(targetDir, "./.rustc_info.json"));
// TODO: remove all unknown files, clean all directories like profiles
try {
await cleanProfileTarget(external_path_default().join(targetDir, "debug"), packages);
}
catch { }
try {
await cleanProfileTarget(external_path_default().join(targetDir, "release"), packages);
}
catch { }
} }
async function cleanProfileTarget(profileDir, packages) { async function cleanProfileTarget(profileDir, packages) {
await lib_io.rmRF(external_path_default().join(profileDir, "./examples")); await lib_io.rmRF(external_path_default().join(profileDir, "examples"));
await lib_io.rmRF(external_path_default().join(profileDir, "./incremental")); await lib_io.rmRF(external_path_default().join(profileDir, "incremental"));
let dir; let dir;
// remove all *files* from the profile directory // remove all *files* from the profile directory
dir = await external_fs_default().promises.opendir(profileDir); dir = await external_fs_default().promises.opendir(profileDir);
@ -61913,8 +61904,8 @@ async function cleanProfileTarget(profileDir, packages) {
} }
} }
const keepPkg = new Set(packages.map((p) => p.name)); const keepPkg = new Set(packages.map((p) => p.name));
await rmExcept(external_path_default().join(profileDir, "./build"), keepPkg); await rmExcept(external_path_default().join(profileDir, "build"), keepPkg);
await rmExcept(external_path_default().join(profileDir, "./.fingerprint"), keepPkg); await rmExcept(external_path_default().join(profileDir, ".fingerprint"), keepPkg);
const keepDeps = new Set(packages.flatMap((p) => { const keepDeps = new Set(packages.flatMap((p) => {
const names = []; const names = [];
for (const n of [p.name, ...p.targets]) { for (const n of [p.name, ...p.targets]) {
@ -61923,7 +61914,7 @@ async function cleanProfileTarget(profileDir, packages) {
} }
return names; return names;
})); }));
await rmExcept(external_path_default().join(profileDir, "./deps"), keepDeps); await rmExcept(external_path_default().join(profileDir, "deps"), keepDeps);
} }
async function cleanBin(config) { async function cleanBin(config) {
const bins = await config.getCargoBins(); const bins = await config.getCargoBins();

30
dist/save/index.js vendored
View file

@ -61646,7 +61646,7 @@ class Workspace {
cwd: this.root, cwd: this.root,
})); }));
for (const pkg of meta.packages) { for (const pkg of meta.packages) {
if (!pkg.manifest_path.startsWith(this.root)) { if (pkg.manifest_path.startsWith(this.root)) {
continue; continue;
} }
const targets = pkg.targets.filter((t) => t.kind[0] === "lib").map((t) => t.name); const targets = pkg.targets.filter((t) => t.kind[0] === "lib").map((t) => t.name);
@ -61875,7 +61875,7 @@ async function cleanTargetDir(targetDir, packages) {
if (dirent.isDirectory()) { if (dirent.isDirectory()) {
let dirName = external_path_default().join(dir.path, dirent.name); let dirName = external_path_default().join(dir.path, dirent.name);
// is it a profile dir, or a nested target dir? // is it a profile dir, or a nested target dir?
let isNestedTarget = await exists(external_path_default().join(dirName, "CACHEDIR.TAG")); let isNestedTarget = (await exists(external_path_default().join(dirName, "CACHEDIR.TAG"))) || (await exists(external_path_default().join(dirName, ".rustc_info.json")));
try { try {
if (isNestedTarget) { if (isNestedTarget) {
await cleanTargetDir(dirName, packages); await cleanTargetDir(dirName, packages);
@ -61891,19 +61891,10 @@ async function cleanTargetDir(targetDir, packages) {
} }
} }
await external_fs_default().promises.unlink(external_path_default().join(targetDir, "./.rustc_info.json")); await external_fs_default().promises.unlink(external_path_default().join(targetDir, "./.rustc_info.json"));
// TODO: remove all unknown files, clean all directories like profiles
try {
await cleanProfileTarget(external_path_default().join(targetDir, "debug"), packages);
}
catch { }
try {
await cleanProfileTarget(external_path_default().join(targetDir, "release"), packages);
}
catch { }
} }
async function cleanProfileTarget(profileDir, packages) { async function cleanProfileTarget(profileDir, packages) {
await io.rmRF(external_path_default().join(profileDir, "./examples")); await io.rmRF(external_path_default().join(profileDir, "examples"));
await io.rmRF(external_path_default().join(profileDir, "./incremental")); await io.rmRF(external_path_default().join(profileDir, "incremental"));
let dir; let dir;
// remove all *files* from the profile directory // remove all *files* from the profile directory
dir = await external_fs_default().promises.opendir(profileDir); dir = await external_fs_default().promises.opendir(profileDir);
@ -61913,8 +61904,8 @@ async function cleanProfileTarget(profileDir, packages) {
} }
} }
const keepPkg = new Set(packages.map((p) => p.name)); const keepPkg = new Set(packages.map((p) => p.name));
await rmExcept(external_path_default().join(profileDir, "./build"), keepPkg); await rmExcept(external_path_default().join(profileDir, "build"), keepPkg);
await rmExcept(external_path_default().join(profileDir, "./.fingerprint"), keepPkg); await rmExcept(external_path_default().join(profileDir, ".fingerprint"), keepPkg);
const keepDeps = new Set(packages.flatMap((p) => { const keepDeps = new Set(packages.flatMap((p) => {
const names = []; const names = [];
for (const n of [p.name, ...p.targets]) { for (const n of [p.name, ...p.targets]) {
@ -61923,7 +61914,7 @@ async function cleanProfileTarget(profileDir, packages) {
} }
return names; return names;
})); }));
await rmExcept(external_path_default().join(profileDir, "./deps"), keepDeps); await rmExcept(external_path_default().join(profileDir, "deps"), keepDeps);
} }
async function cleanBin(config) { async function cleanBin(config) {
const bins = await config.getCargoBins(); const bins = await config.getCargoBins();
@ -62062,21 +62053,22 @@ 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 ...`);
const registryName = await getRegistryName(config);
const allPackages = []; const allPackages = [];
for (const workspace of config.workspaces) { for (const workspace of config.workspaces) {
const packages = await workspace.getPackages(); const packages = await workspace.getPackages();
allPackages.push(...packages); allPackages.push(...packages);
try { try {
core.info(`... Cleaning ${workspace.target} ...`);
await cleanTargetDir(workspace.target, packages); await cleanTargetDir(workspace.target, packages);
} }
catch (e) { catch (e) {
core.info(`[warning] ${e.stack}`); core.info(`[warning] ${e.stack}`);
} }
} }
const registryName = await getRegistryName(config);
if (registryName) { if (registryName) {
try { try {
core.info(`... Cleaning cargo registry ...`);
await cleanRegistry(config, registryName, allPackages); await cleanRegistry(config, registryName, allPackages);
} }
catch (e) { catch (e) {
@ -62084,12 +62076,14 @@ async function run() {
} }
} }
try { try {
core.info(`... Cleaning cargo/bin ...`);
await cleanBin(config); await cleanBin(config);
} }
catch (e) { catch (e) {
core.info(`[warning] ${e.stack}`); core.info(`[warning] ${e.stack}`);
} }
try { try {
core.info(`... Cleaning cargo git cache ...`);
await cleanGit(config, allPackages); await cleanGit(config, allPackages);
} }
catch (e) { catch (e) {

21
src/cleanup.ts
View file

@ -14,7 +14,8 @@ export async function cleanTargetDir(targetDir: string, packages: Packages) {
if (dirent.isDirectory()) { if (dirent.isDirectory()) {
let dirName = path.join(dir.path, dirent.name); let dirName = path.join(dir.path, dirent.name);
// is it a profile dir, or a nested target dir? // is it a profile dir, or a nested target dir?
let isNestedTarget = await exists(path.join(dirName, "CACHEDIR.TAG")); let isNestedTarget =
(await exists(path.join(dirName, "CACHEDIR.TAG"))) || (await exists(path.join(dirName, ".rustc_info.json")));
try { try {
if (isNestedTarget) { if (isNestedTarget) {
@ -29,19 +30,11 @@ export async function cleanTargetDir(targetDir: string, packages: Packages) {
} }
await fs.promises.unlink(path.join(targetDir, "./.rustc_info.json")); await fs.promises.unlink(path.join(targetDir, "./.rustc_info.json"));
// TODO: remove all unknown files, clean all directories like profiles
try {
await cleanProfileTarget(path.join(targetDir, "debug"), packages);
} catch {}
try {
await cleanProfileTarget(path.join(targetDir, "release"), packages);
} catch {}
} }
async function cleanProfileTarget(profileDir: string, packages: Packages) { async function cleanProfileTarget(profileDir: string, packages: Packages) {
await io.rmRF(path.join(profileDir, "./examples")); await io.rmRF(path.join(profileDir, "examples"));
await io.rmRF(path.join(profileDir, "./incremental")); await io.rmRF(path.join(profileDir, "incremental"));
let dir: fs.Dir; let dir: fs.Dir;
// remove all *files* from the profile directory // remove all *files* from the profile directory
@ -53,8 +46,8 @@ async function cleanProfileTarget(profileDir: string, packages: Packages) {
} }
const keepPkg = new Set(packages.map((p) => p.name)); const keepPkg = new Set(packages.map((p) => p.name));
await rmExcept(path.join(profileDir, "./build"), keepPkg); await rmExcept(path.join(profileDir, "build"), keepPkg);
await rmExcept(path.join(profileDir, "./.fingerprint"), keepPkg); await rmExcept(path.join(profileDir, ".fingerprint"), keepPkg);
const keepDeps = new Set( const keepDeps = new Set(
packages.flatMap((p) => { packages.flatMap((p) => {
@ -66,7 +59,7 @@ async function cleanProfileTarget(profileDir: string, packages: Packages) {
return names; return names;
}), }),
); );
await rmExcept(path.join(profileDir, "./deps"), keepDeps); await rmExcept(path.join(profileDir, "deps"), keepDeps);
} }
export async function cleanBin(config: CacheConfig) { export async function cleanBin(config: CacheConfig) {

9
src/save.ts
View file

@ -32,23 +32,22 @@ 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 ...`);
const registryName = await getRegistryName(config);
const allPackages = []; const allPackages = [];
for (const workspace of config.workspaces) { for (const workspace of config.workspaces) {
const packages = await workspace.getPackages(); const packages = await workspace.getPackages();
allPackages.push(...packages); allPackages.push(...packages);
try { try {
core.info(`... Cleaning ${workspace.target} ...`);
await cleanTargetDir(workspace.target, packages); await cleanTargetDir(workspace.target, packages);
} catch (e) { } catch (e) {
core.info(`[warning] ${(e as any).stack}`); core.info(`[warning] ${(e as any).stack}`);
} }
} }
const registryName = await getRegistryName(config);
if (registryName) { if (registryName) {
try { try {
core.info(`... Cleaning cargo registry ...`);
await cleanRegistry(config, registryName, allPackages); await cleanRegistry(config, registryName, allPackages);
} catch (e) { } catch (e) {
core.info(`[warning] ${(e as any).stack}`); core.info(`[warning] ${(e as any).stack}`);
@ -56,12 +55,14 @@ async function run() {
} }
try { try {
core.info(`... Cleaning cargo/bin ...`);
await cleanBin(config); await cleanBin(config);
} catch (e) { } catch (e) {
core.info(`[warning] ${(e as any).stack}`); core.info(`[warning] ${(e as any).stack}`);
} }
try { try {
core.info(`... Cleaning cargo git cache ...`);
await cleanGit(config, allPackages); await cleanGit(config, allPackages);
} catch (e) { } catch (e) {
core.info(`[warning] ${(e as any).stack}`); core.info(`[warning] ${(e as any).stack}`);

2
src/workspace.ts
View file

@ -14,7 +14,7 @@ export class Workspace {
}), }),
); );
for (const pkg of meta.packages) { for (const pkg of meta.packages) {
if (!pkg.manifest_path.startsWith(this.root)) { if (pkg.manifest_path.startsWith(this.root)) {
continue; continue;
} }
const targets = pkg.targets.filter((t) => t.kind[0] === "lib").map((t) => t.name); const targets = pkg.targets.filter((t) => t.kind[0] === "lib").map((t) => t.name);