Caching cleanup

pull/310/head
Frostebite 2022-01-02 05:21:58 +00:00
parent 1ed2d2a1d4
commit c856879f79
3 changed files with 7 additions and 7 deletions

6
dist/index.js vendored
View File

@ -547,7 +547,7 @@ class Caching {
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`tree ${sourceFolder}`); yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`tree ${sourceFolder}`);
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`tree ${cacheFolder}`); yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`tree ${cacheFolder}`);
} }
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`zip -r "${cacheKey}.zip" "${path_1.default.dirname(sourceFolder)}"`); yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`zip -r "${cacheKey}.zip" "${path_1.default.basename(sourceFolder)}"`);
console_1.assert(fs_1.default.existsSync(`${cacheKey}.zip`)); console_1.assert(fs_1.default.existsSync(`${cacheKey}.zip`));
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`cp "${cacheKey}.zip" "${path_1.default.join(cacheFolder, `${cacheKey}.zip`)}"`); yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`cp "${cacheKey}.zip" "${path_1.default.join(cacheFolder, `${cacheKey}.zip`)}"`);
remote_client_logger_1.RemoteClientLogger.log(`copied ${cacheKey} to ${cacheFolder}`); remote_client_logger_1.RemoteClientLogger.log(`copied ${cacheKey} to ${cacheFolder}`);
@ -565,7 +565,7 @@ class Caching {
} }
static PullFromCache(cacheFolder, destinationFolder, cacheKey = ``) { static PullFromCache(cacheFolder, destinationFolder, cacheKey = ``) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
remote_client_logger_1.RemoteClientLogger.log(`Caching for ${path_1.default.dirname(destinationFolder)}`); remote_client_logger_1.RemoteClientLogger.log(`Caching for ${path_1.default.basename(destinationFolder)}`);
try { try {
if (!fs_1.default.existsSync(cacheFolder)) { if (!fs_1.default.existsSync(cacheFolder)) {
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`mkdir -p ${cacheFolder}`); yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`mkdir -p ${cacheFolder}`);
@ -588,7 +588,7 @@ class Caching {
} }
remote_client_logger_1.RemoteClientLogger.log(`cache item exists`); remote_client_logger_1.RemoteClientLogger.log(`cache item exists`);
console_1.assert(fs_1.default.existsSync(destinationFolder)); console_1.assert(fs_1.default.existsSync(destinationFolder));
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`unzip "${cacheSelection}" -d "${path_1.default.dirname(destinationFolder)}"`); yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`unzip "${cacheSelection}" -d "${path_1.default.basename(destinationFolder)}"`);
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`cp -r "${cacheSelection}" "${destinationFolder}/..""`); yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`cp -r "${cacheSelection}" "${destinationFolder}/..""`);
if (__1.Input.cloudRunnerTests) { if (__1.Input.cloudRunnerTests) {
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`tree ${destinationFolder}`); yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`tree ${destinationFolder}`);

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -21,7 +21,7 @@ export class Caching {
await CloudRunnerAgentSystem.Run(`tree ${sourceFolder}`); await CloudRunnerAgentSystem.Run(`tree ${sourceFolder}`);
await CloudRunnerAgentSystem.Run(`tree ${cacheFolder}`); await CloudRunnerAgentSystem.Run(`tree ${cacheFolder}`);
} }
await CloudRunnerAgentSystem.Run(`zip -r "${cacheKey}.zip" "${path.dirname(sourceFolder)}"`); await CloudRunnerAgentSystem.Run(`zip -r "${cacheKey}.zip" "${path.basename(sourceFolder)}"`);
assert(fs.existsSync(`${cacheKey}.zip`)); assert(fs.existsSync(`${cacheKey}.zip`));
await CloudRunnerAgentSystem.Run(`cp "${cacheKey}.zip" "${path.join(cacheFolder, `${cacheKey}.zip`)}"`); await CloudRunnerAgentSystem.Run(`cp "${cacheKey}.zip" "${path.join(cacheFolder, `${cacheKey}.zip`)}"`);
RemoteClientLogger.log(`copied ${cacheKey} to ${cacheFolder}`); RemoteClientLogger.log(`copied ${cacheKey} to ${cacheFolder}`);
@ -37,7 +37,7 @@ export class Caching {
} }
} }
public static async PullFromCache(cacheFolder: string, destinationFolder: string, cacheKey: string = ``) { public static async PullFromCache(cacheFolder: string, destinationFolder: string, cacheKey: string = ``) {
RemoteClientLogger.log(`Caching for ${path.dirname(destinationFolder)}`); RemoteClientLogger.log(`Caching for ${path.basename(destinationFolder)}`);
try { try {
if (!fs.existsSync(cacheFolder)) { if (!fs.existsSync(cacheFolder)) {
await CloudRunnerAgentSystem.Run(`mkdir -p ${cacheFolder}`); await CloudRunnerAgentSystem.Run(`mkdir -p ${cacheFolder}`);
@ -69,7 +69,7 @@ export class Caching {
} }
RemoteClientLogger.log(`cache item exists`); RemoteClientLogger.log(`cache item exists`);
assert(fs.existsSync(destinationFolder)); assert(fs.existsSync(destinationFolder));
await CloudRunnerAgentSystem.Run(`unzip "${cacheSelection}" -d "${path.dirname(destinationFolder)}"`); await CloudRunnerAgentSystem.Run(`unzip "${cacheSelection}" -d "${path.basename(destinationFolder)}"`);
await CloudRunnerAgentSystem.Run(`cp -r "${cacheSelection}" "${destinationFolder}/..""`); await CloudRunnerAgentSystem.Run(`cp -r "${cacheSelection}" "${destinationFolder}/..""`);
if (Input.cloudRunnerTests) { if (Input.cloudRunnerTests) {
await CloudRunnerAgentSystem.Run(`tree ${destinationFolder}`); await CloudRunnerAgentSystem.Run(`tree ${destinationFolder}`);