actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Caching cleanup

pull/310/head
Frostebite 2022-01-02 07:16:24 +00:00
parent 33d5e3c4df
commit 2b3f235527
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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} ${path_1.default.basename(sourceFolder)}`); yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`zip -q -r ${cacheKey} ${path_1.default.basename(sourceFolder)}`);
console_1.assert(fs_1.default.existsSync(`${cacheKey}`)); console_1.assert(fs_1.default.existsSync(`${cacheKey}`));
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`mv ${cacheKey}.zip ${cacheFolder}`); yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`mv ${cacheKey}.zip ${cacheFolder}`);
remote_client_logger_1.RemoteClientLogger.log(`moved ${cacheKey}.zip to ${cacheFolder}`); remote_client_logger_1.RemoteClientLogger.log(`moved ${cacheKey}.zip to ${cacheFolder}`);
@ -590,7 +590,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}.zip -d ${path_1.default.basename(destinationFolder)}`); yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`unzip -q ${cacheSelection}.zip -d ${path_1.default.basename(destinationFolder)}`);
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`mv ${path_1.default.basename(destinationFolder)}/* ${destinationFolder}`); yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`mv ${path_1.default.basename(destinationFolder)}/* ${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}`);
@ -829,9 +829,9 @@ class SetupCloudRunnerRepository {
if (!fs_1.default.existsSync(cloud_runner_state_1.CloudRunnerState.libraryFolderFull)) { if (!fs_1.default.existsSync(cloud_runner_state_1.CloudRunnerState.libraryFolderFull)) {
remote_client_logger_1.RemoteClientLogger.logWarning(`!Warning!: The Unity library was included in the git repository`); remote_client_logger_1.RemoteClientLogger.logWarning(`!Warning!: The Unity library was included in the git repository`);
} }
yield caching_1.Caching.PullFromCache(cloud_runner_state_1.CloudRunnerState.lfsCacheFolderFull, cloud_runner_state_1.CloudRunnerState.lfsDirectory, `${lfsHashes.lfsGuid}.zip`); yield caching_1.Caching.PullFromCache(cloud_runner_state_1.CloudRunnerState.lfsCacheFolderFull, cloud_runner_state_1.CloudRunnerState.lfsDirectory, `${lfsHashes.lfsGuid}`);
yield SetupCloudRunnerRepository.pullLatestLFS(); yield SetupCloudRunnerRepository.pullLatestLFS();
yield caching_1.Caching.PushToCache(cloud_runner_state_1.CloudRunnerState.lfsCacheFolderFull, cloud_runner_state_1.CloudRunnerState.lfsDirectory, `${lfsHashes.lfsGuid}.zip`); yield caching_1.Caching.PushToCache(cloud_runner_state_1.CloudRunnerState.lfsCacheFolderFull, cloud_runner_state_1.CloudRunnerState.lfsDirectory, `${lfsHashes.lfsGuid}`);
yield caching_1.Caching.PullFromCache(cloud_runner_state_1.CloudRunnerState.libraryCacheFolderFull, cloud_runner_state_1.CloudRunnerState.libraryFolderFull); yield caching_1.Caching.PullFromCache(cloud_runner_state_1.CloudRunnerState.libraryCacheFolderFull, cloud_runner_state_1.CloudRunnerState.libraryFolderFull);
caching_1.Caching.handleCachePurging(); caching_1.Caching.handleCachePurging();
} }

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
src/model/cli/remote-client/caching.ts
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} ${path.basename(sourceFolder)}`); await CloudRunnerAgentSystem.Run(`zip -q -r ${cacheKey} ${path.basename(sourceFolder)}`);
assert(fs.existsSync(`${cacheKey}`)); assert(fs.existsSync(`${cacheKey}`));
await CloudRunnerAgentSystem.Run(`mv ${cacheKey}.zip ${cacheFolder}`); await CloudRunnerAgentSystem.Run(`mv ${cacheKey}.zip ${cacheFolder}`);
RemoteClientLogger.log(`moved ${cacheKey}.zip to ${cacheFolder}`); RemoteClientLogger.log(`moved ${cacheKey}.zip to ${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}.zip -d ${path.basename(destinationFolder)}`); await CloudRunnerAgentSystem.Run(`unzip -q ${cacheSelection}.zip -d ${path.basename(destinationFolder)}`);
await CloudRunnerAgentSystem.Run(`mv ${path.basename(destinationFolder)}/* ${destinationFolder}`); await CloudRunnerAgentSystem.Run(`mv ${path.basename(destinationFolder)}/* ${destinationFolder}`);
if (Input.cloudRunnerTests) { if (Input.cloudRunnerTests) {
await CloudRunnerAgentSystem.Run(`tree ${destinationFolder}`); await CloudRunnerAgentSystem.Run(`tree ${destinationFolder}`);

4
src/model/cli/remote-client/setup-cloud-runner-repository.ts
View File

@ -19,13 +19,13 @@ export class SetupCloudRunnerRepository {
await Caching.PullFromCache( await Caching.PullFromCache(
CloudRunnerState.lfsCacheFolderFull, CloudRunnerState.lfsCacheFolderFull,
CloudRunnerState.lfsDirectory, CloudRunnerState.lfsDirectory,
`${lfsHashes.lfsGuid}.zip`, `${lfsHashes.lfsGuid}`,
); );
await SetupCloudRunnerRepository.pullLatestLFS(); await SetupCloudRunnerRepository.pullLatestLFS();
await Caching.PushToCache( await Caching.PushToCache(
CloudRunnerState.lfsCacheFolderFull, CloudRunnerState.lfsCacheFolderFull,
CloudRunnerState.lfsDirectory, CloudRunnerState.lfsDirectory,
`${lfsHashes.lfsGuid}.zip`, `${lfsHashes.lfsGuid}`,
); );
await Caching.PullFromCache(CloudRunnerState.libraryCacheFolderFull, CloudRunnerState.libraryFolderFull); await Caching.PullFromCache(CloudRunnerState.libraryCacheFolderFull, CloudRunnerState.libraryFolderFull);