Fix nested Library cache
parent
bd3ce2e7e8
commit
bf1373c4c3
|
|
@ -589,9 +589,9 @@ 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_system_1.CloudRunnerSystem.Run(`unzip -q ${cacheSelection}.zip -d ${path_1.default.basename(destinationFolder)}`);
|
yield cloud_runner_system_1.CloudRunnerSystem.Run(`unzip${__1.Input.cloudRunnerTests ? '' : ' -q'} ${cacheSelection}.zip -d ${path_1.default.basename(destinationFolder)}`);
|
||||||
process.chdir(path_1.default.basename(destinationFolder));
|
process.chdir(path_1.default.basename(destinationFolder));
|
||||||
yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv * ${destinationFolder}`);
|
yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv "${path_1.default.basename(destinationFolder)}/*" "${destinationFolder}/.."`);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
remote_client_logger_1.RemoteClientLogger.logWarning(`cache item ${cacheKey} doesn't exist ${destinationFolder}`);
|
remote_client_logger_1.RemoteClientLogger.logWarning(`cache item ${cacheKey} doesn't exist ${destinationFolder}`);
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -80,9 +80,11 @@ export class Caching {
|
||||||
}
|
}
|
||||||
RemoteClientLogger.log(`cache item exists`);
|
RemoteClientLogger.log(`cache item exists`);
|
||||||
assert(`${fs.existsSync(destinationFolder)}`);
|
assert(`${fs.existsSync(destinationFolder)}`);
|
||||||
await CloudRunnerSystem.Run(`unzip -q ${cacheSelection}.zip -d ${path.basename(destinationFolder)}`);
|
await CloudRunnerSystem.Run(
|
||||||
|
`unzip${Input.cloudRunnerTests ? '' : ' -q'} ${cacheSelection}.zip -d ${path.basename(destinationFolder)}`,
|
||||||
|
);
|
||||||
process.chdir(path.basename(destinationFolder));
|
process.chdir(path.basename(destinationFolder));
|
||||||
await CloudRunnerSystem.Run(`mv * ${destinationFolder}`);
|
await CloudRunnerSystem.Run(`mv "${path.basename(destinationFolder)}/*" "${destinationFolder}/.."`);
|
||||||
} else {
|
} else {
|
||||||
RemoteClientLogger.logWarning(`cache item ${cacheKey} doesn't exist ${destinationFolder}`);
|
RemoteClientLogger.logWarning(`cache item ${cacheKey} doesn't exist ${destinationFolder}`);
|
||||||
if (cacheSelection !== ``) {
|
if (cacheSelection !== ``) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue