move results directory subcontents explicitly
parent
08b90ff4fc
commit
a07f8d4e6c
|
|
@ -603,7 +603,7 @@ class Caching {
|
||||||
yield cloud_runner_system_1.CloudRunnerSystem.Run(`unzip ${cacheSelection}.zip -d ${path_1.default.basename(resultsDirectory)}`);
|
yield cloud_runner_system_1.CloudRunnerSystem.Run(`unzip ${cacheSelection}.zip -d ${path_1.default.basename(resultsDirectory)}`);
|
||||||
remote_client_logger_1.RemoteClientLogger.log(`cache item extracted to ${fullDestination}`);
|
remote_client_logger_1.RemoteClientLogger.log(`cache item extracted to ${fullDestination}`);
|
||||||
console_1.assert(`${fs_1.default.existsSync(fullDestination)}`);
|
console_1.assert(`${fs_1.default.existsSync(fullDestination)}`);
|
||||||
yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv "${fullDestination}" "${destinationFolder}"`);
|
yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv "${fullDestination}/{,.[^.]}*" "${destinationFolder}"`);
|
||||||
fs_1.default.rmdirSync(fullDestination);
|
fs_1.default.rmdirSync(fullDestination);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -77,7 +77,7 @@ export class Caching {
|
||||||
await CloudRunnerSystem.Run(`unzip ${cacheSelection}.zip -d ${path.basename(resultsDirectory)}`);
|
await CloudRunnerSystem.Run(`unzip ${cacheSelection}.zip -d ${path.basename(resultsDirectory)}`);
|
||||||
RemoteClientLogger.log(`cache item extracted to ${fullDestination}`);
|
RemoteClientLogger.log(`cache item extracted to ${fullDestination}`);
|
||||||
assert(`${fs.existsSync(fullDestination)}`);
|
assert(`${fs.existsSync(fullDestination)}`);
|
||||||
await CloudRunnerSystem.Run(`mv "${fullDestination}" "${destinationFolder}"`);
|
await CloudRunnerSystem.Run(`mv "${fullDestination}/{,.[^.]}*" "${destinationFolder}"`);
|
||||||
fs.rmdirSync(fullDestination);
|
fs.rmdirSync(fullDestination);
|
||||||
} else {
|
} else {
|
||||||
RemoteClientLogger.logWarning(`cache item ${cacheKey} doesn't exist ${destinationFolder}`);
|
RemoteClientLogger.logWarning(`cache item ${cacheKey} doesn't exist ${destinationFolder}`);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue