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

Logging improvement

pull/310/head
Frostebite 2021-12-27 22:39:02 +00:00
parent cafabf6c7d
commit 93967f789c
4 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dist/index.js vendored
View File

@ -615,7 +615,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.CloudRunnerRepositorySetup = void 0; exports.CloudRunnerRepositorySetup = void 0;
const console_1 = __webpack_require__(57082); const console_1 = __webpack_require__(57082);
const fs_1 = __importDefault(__webpack_require__(35747)); const fs_1 = __importDefault(__webpack_require__(35747));
const path_1 = __importDefault(__webpack_require__(85622));
const cloud_runner_logger_1 = __importDefault(__webpack_require__(22855)); const cloud_runner_logger_1 = __importDefault(__webpack_require__(22855));
const cloud_runner_state_1 = __webpack_require__(70912); const cloud_runner_state_1 = __webpack_require__(70912);
const caching_1 = __webpack_require__(35010); const caching_1 = __webpack_require__(35010);
@ -631,21 +630,14 @@ class CloudRunnerRepositorySetup {
CloudRunnerRepositorySetup.LFS_ASSETS_HASH = yield lfs_hashing_1.LFSHashing.createLFSHashFiles(); CloudRunnerRepositorySetup.LFS_ASSETS_HASH = yield lfs_hashing_1.LFSHashing.createLFSHashFiles();
cloud_runner_logger_1.default.logCli(CloudRunnerRepositorySetup.LFS_ASSETS_HASH); cloud_runner_logger_1.default.logCli(CloudRunnerRepositorySetup.LFS_ASSETS_HASH);
yield lfs_hashing_1.LFSHashing.printLFSHashState(); yield lfs_hashing_1.LFSHashing.printLFSHashState();
const lfsCacheFolder = path_1.default.join(cloud_runner_state_1.CloudRunnerState.cacheFolderFull, `lfs`);
const libraryCacheFolder = path_1.default.join(cloud_runner_state_1.CloudRunnerState.cacheFolderFull, `lib`);
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`tree ${cloud_runner_state_1.CloudRunnerState.repoPathFull}`);
cloud_runner_logger_1.default.logCli(`Library Caching`); cloud_runner_logger_1.default.logCli(`Library Caching`);
console_1.assert(fs_1.default.existsSync(cloud_runner_state_1.CloudRunnerState.libraryFolderFull), `!Warning!: The Unity library was included in the git repository`); console_1.assert(fs_1.default.existsSync(cloud_runner_state_1.CloudRunnerState.libraryFolderFull), `!Warning!: The Unity library was included in the git repository`);
yield caching_1.Caching.PullFromCache(libraryCacheFolder, cloud_runner_state_1.CloudRunnerState.libraryFolderFull); yield caching_1.Caching.PullFromCache(cloud_runner_state_1.CloudRunnerState.libraryCacheFolder, cloud_runner_state_1.CloudRunnerState.libraryFolderFull);
cloud_runner_logger_1.default.logCli(`LFS Caching`); cloud_runner_logger_1.default.logCli(`LFS Caching`);
yield caching_1.Caching.PullFromCache(lfsCacheFolder, cloud_runner_state_1.CloudRunnerState.lfsDirectory, `${CloudRunnerRepositorySetup.LFS_ASSETS_HASH}.zip`); yield caching_1.Caching.PullFromCache(cloud_runner_state_1.CloudRunnerState.lfsCacheFolder, cloud_runner_state_1.CloudRunnerState.lfsDirectory, `${CloudRunnerRepositorySetup.LFS_ASSETS_HASH}.zip`);
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`tree ${cloud_runner_state_1.CloudRunnerState.repoPathFull}`); yield caching_1.Caching.printCacheState(cloud_runner_state_1.CloudRunnerState.lfsCacheFolder, cloud_runner_state_1.CloudRunnerState.libraryCacheFolder);
yield caching_1.Caching.printCacheState(lfsCacheFolder, libraryCacheFolder);
yield CloudRunnerRepositorySetup.pullLatestLFS(); yield CloudRunnerRepositorySetup.pullLatestLFS();
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`tree ${cloud_runner_state_1.CloudRunnerState.repoPathFull}`); yield caching_1.Caching.PushToCache(cloud_runner_state_1.CloudRunnerState.lfsCacheFolder, cloud_runner_state_1.CloudRunnerState.lfsDirectory, CloudRunnerRepositorySetup.LFS_ASSETS_HASH);
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`tree ${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}`);
yield caching_1.Caching.PushToCache(lfsCacheFolder, cloud_runner_state_1.CloudRunnerState.lfsDirectory, CloudRunnerRepositorySetup.LFS_ASSETS_HASH);
yield cloud_runner_agent_system_1.CloudRunnerAgentSystem.Run(`tree ${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}`);
caching_1.Caching.handleCachePurging(); caching_1.Caching.handleCachePurging();
} }
catch (error) { catch (error) {
@ -2552,6 +2544,12 @@ class CloudRunnerState {
static get purgeRemoteCaching() { static get purgeRemoteCaching() {
return process.env.PURGE_REMOTE_BUILDER_CACHE !== undefined; return process.env.PURGE_REMOTE_BUILDER_CACHE !== undefined;
} }
static get lfsCacheFolder() {
return path_1.default.join(CloudRunnerState.cacheFolderFull, `lfs`);
}
static get libraryCacheFolder() {
return path_1.default.join(CloudRunnerState.cacheFolderFull, `lib`);
}
static get unityBuilderRepoUrl() { static get unityBuilderRepoUrl() {
return `https://${CloudRunnerState.buildParams.githubToken}@github.com/game-ci/unity-builder.git`; return `https://${CloudRunnerState.buildParams.githubToken}@github.com/game-ci/unity-builder.git`;
} }

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,6 +1,5 @@
import { assert } from 'console'; import { assert } from 'console';
import fs from 'fs'; import fs from 'fs';
import path from 'path';
import CloudRunnerLogger from '../../cloud-runner/services/cloud-runner-logger'; import CloudRunnerLogger from '../../cloud-runner/services/cloud-runner-logger';
import { CloudRunnerState } from '../../cloud-runner/state/cloud-runner-state'; import { CloudRunnerState } from '../../cloud-runner/state/cloud-runner-state';
import { Caching } from './caching'; import { Caching } from './caching';
@ -18,32 +17,25 @@ export class CloudRunnerRepositorySetup {
CloudRunnerRepositorySetup.LFS_ASSETS_HASH = await LFSHashing.createLFSHashFiles(); CloudRunnerRepositorySetup.LFS_ASSETS_HASH = await LFSHashing.createLFSHashFiles();
CloudRunnerLogger.logCli(CloudRunnerRepositorySetup.LFS_ASSETS_HASH); CloudRunnerLogger.logCli(CloudRunnerRepositorySetup.LFS_ASSETS_HASH);
await LFSHashing.printLFSHashState(); await LFSHashing.printLFSHashState();
const lfsCacheFolder = path.join(CloudRunnerState.cacheFolderFull, `lfs`);
const libraryCacheFolder = path.join(CloudRunnerState.cacheFolderFull, `lib`);
await CloudRunnerAgentSystem.Run(`tree ${CloudRunnerState.repoPathFull}`);
CloudRunnerLogger.logCli(`Library Caching`); CloudRunnerLogger.logCli(`Library Caching`);
assert( assert(
fs.existsSync(CloudRunnerState.libraryFolderFull), fs.existsSync(CloudRunnerState.libraryFolderFull),
`!Warning!: The Unity library was included in the git repository`, `!Warning!: The Unity library was included in the git repository`,
); );
await Caching.PullFromCache(libraryCacheFolder, CloudRunnerState.libraryFolderFull); await Caching.PullFromCache(CloudRunnerState.libraryCacheFolder, CloudRunnerState.libraryFolderFull);
CloudRunnerLogger.logCli(`LFS Caching`); CloudRunnerLogger.logCli(`LFS Caching`);
await Caching.PullFromCache( await Caching.PullFromCache(
lfsCacheFolder, CloudRunnerState.lfsCacheFolder,
CloudRunnerState.lfsDirectory, CloudRunnerState.lfsDirectory,
`${CloudRunnerRepositorySetup.LFS_ASSETS_HASH}.zip`, `${CloudRunnerRepositorySetup.LFS_ASSETS_HASH}.zip`,
); );
await CloudRunnerAgentSystem.Run(`tree ${CloudRunnerState.repoPathFull}`); await Caching.printCacheState(CloudRunnerState.lfsCacheFolder, CloudRunnerState.libraryCacheFolder);
await Caching.printCacheState(lfsCacheFolder, libraryCacheFolder);
await CloudRunnerRepositorySetup.pullLatestLFS(); await CloudRunnerRepositorySetup.pullLatestLFS();
await CloudRunnerAgentSystem.Run(`tree ${CloudRunnerState.repoPathFull}`);
await CloudRunnerAgentSystem.Run(`tree ${CloudRunnerState.cacheFolderFull}`);
await Caching.PushToCache( await Caching.PushToCache(
lfsCacheFolder, CloudRunnerState.lfsCacheFolder,
CloudRunnerState.lfsDirectory, CloudRunnerState.lfsDirectory,
CloudRunnerRepositorySetup.LFS_ASSETS_HASH, CloudRunnerRepositorySetup.LFS_ASSETS_HASH,
); );
await CloudRunnerAgentSystem.Run(`tree ${CloudRunnerState.cacheFolderFull}`);
Caching.handleCachePurging(); Caching.handleCachePurging();
} catch (error) { } catch (error) {
throw error; throw error;

6
src/model/cloud-runner/state/cloud-runner-state.ts
View File

@ -51,6 +51,12 @@ export class CloudRunnerState {
public static get purgeRemoteCaching(): boolean { public static get purgeRemoteCaching(): boolean {
return process.env.PURGE_REMOTE_BUILDER_CACHE !== undefined; return process.env.PURGE_REMOTE_BUILDER_CACHE !== undefined;
} }
public static get lfsCacheFolder() {
return path.join(CloudRunnerState.cacheFolderFull, `lfs`);
}
public static get libraryCacheFolder() {
return path.join(CloudRunnerState.cacheFolderFull, `lib`);
}
public static get unityBuilderRepoUrl(): string { public static get unityBuilderRepoUrl(): string {
return `https://${CloudRunnerState.buildParams.githubToken}@github.com/game-ci/unity-builder.git`; return `https://${CloudRunnerState.buildParams.githubToken}@github.com/game-ci/unity-builder.git`;
} }