Assume cache results are nested within zip 1 layer

pull/310/head
Frostebite 2022-01-29 21:53:12 +00:00
parent 2968d5662e
commit c97d032bf9
3 changed files with 11 additions and 11 deletions

9
dist/index.js vendored
View File

@ -611,19 +611,18 @@ class Caching {
remote_client_logger_1.RemoteClientLogger.log(`cache item exists ${cacheFolder}/${cacheSelection}.zip`);
console_1.assert(`${fs_1.default.existsSync(destinationFolder)}`);
console_1.assert(`${fs_1.default.existsSync(`${cacheSelection}.zip`)}`);
const fullDestination = path_1.default.join(cacheFolder, resultsFolder);
const fullResultsFolder = path_1.default.join(cacheFolder, resultsFolder);
if (__1.Input.cloudRunnerTests) {
yield cloud_runner_system_1.CloudRunnerSystem.Run(`tree ${cacheFolder}`);
}
yield cloud_runner_system_1.CloudRunnerSystem.Run(`unzip ${cacheSelection}.zip -d ${path_1.default.basename(resultsFolder)}`);
remote_client_logger_1.RemoteClientLogger.log(`cache item extracted to ${fullDestination}`);
console_1.assert(`${fs_1.default.existsSync(fullDestination)}`);
remote_client_logger_1.RemoteClientLogger.log(`cache item extracted to ${fullResultsFolder}`);
console_1.assert(`${fs_1.default.existsSync(fullResultsFolder)}`);
const destinationParentFolder = path_1.default.resolve(destinationFolder, '..');
yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv "${fullDestination}" "${destinationParentFolder}"`);
if (fs_1.default.existsSync(destinationFolder)) {
fs_1.default.rmSync(destinationFolder, { recursive: true, force: true });
}
fs_1.default.renameSync(path_1.default.resolve(destinationParentFolder, resultsFolder), destinationFolder);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv "${fullResultsFolder}/${path_1.default.basename(destinationFolder)}" "${destinationParentFolder}"`);
if (__1.Input.cloudRunnerTests) {
yield cloud_runner_system_1.CloudRunnerSystem.Run(`tree ${destinationParentFolder}`);
}

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -74,19 +74,20 @@ export class Caching {
RemoteClientLogger.log(`cache item exists ${cacheFolder}/${cacheSelection}.zip`);
assert(`${fs.existsSync(destinationFolder)}`);
assert(`${fs.existsSync(`${cacheSelection}.zip`)}`);
const fullDestination = path.join(cacheFolder, resultsFolder);
const fullResultsFolder = path.join(cacheFolder, resultsFolder);
if (Input.cloudRunnerTests) {
await CloudRunnerSystem.Run(`tree ${cacheFolder}`);
}
await CloudRunnerSystem.Run(`unzip ${cacheSelection}.zip -d ${path.basename(resultsFolder)}`);
RemoteClientLogger.log(`cache item extracted to ${fullDestination}`);
assert(`${fs.existsSync(fullDestination)}`);
RemoteClientLogger.log(`cache item extracted to ${fullResultsFolder}`);
assert(`${fs.existsSync(fullResultsFolder)}`);
const destinationParentFolder = path.resolve(destinationFolder, '..');
await CloudRunnerSystem.Run(`mv "${fullDestination}" "${destinationParentFolder}"`);
if (fs.existsSync(destinationFolder)) {
fs.rmSync(destinationFolder, { recursive: true, force: true });
}
fs.renameSync(path.resolve(destinationParentFolder, resultsFolder), destinationFolder);
await CloudRunnerSystem.Run(
`mv "${fullResultsFolder}/${path.basename(destinationFolder)}" "${destinationParentFolder}"`,
);
if (Input.cloudRunnerTests) {
await CloudRunnerSystem.Run(`tree ${destinationParentFolder}`);
}