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

cleanup

pull/437/head
Frostebite 2022-10-14 19:51:16 +01:00
parent 7de5bfdaef
commit 1a0bc6d1ce
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/index.js vendored
View File

@ -689,9 +689,11 @@ class SharedWorkspaceLocking {
if (!(yield SharedWorkspaceLocking.DoesWorkspaceExist(workspace, buildParametersContext))) { if (!(yield SharedWorkspaceLocking.DoesWorkspaceExist(workspace, buildParametersContext))) {
return false; return false;
} }
cloud_runner_logger_1.default.log(`Checking has workspace (${workspace}) was locked`); cloud_runner_logger_1.default.log(`Checking has workspace ${workspace} was locked`);
return ((yield SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext)).filter((x) => x.includes(runId)) const locks = yield SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext);
.length > 0); const includesRunLock = locks.filter((x) => x.includes(runId)).length > 0;
cloud_runner_logger_1.default.log(`Locks ${locks}, includes ${includesRunLock}`);
return includesRunLock;
}); });
} }
static GetFreeWorkspaces(buildParametersContext) { static GetFreeWorkspaces(buildParametersContext) {
@ -730,6 +732,8 @@ class SharedWorkspaceLocking {
fs.writeFileSync(file, ''); fs.writeFileSync(file, '');
yield cloud_runner_system_1.CloudRunnerSystem.Run(`aws s3 cp ./${file} ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${workspace}/${file}`, false, true); yield cloud_runner_system_1.CloudRunnerSystem.Run(`aws s3 cp ./${file} ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${workspace}/${file}`, false, true);
fs.rmSync(file); fs.rmSync(file);
const workspaces = yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`);
cloud_runner_logger_1.default.log(`All workspaces ${workspaces}`);
return workspace; return workspace;
}); });
} }
@ -4570,13 +4574,13 @@ const cloud_runner_options_1 = __importDefault(__nccwpck_require__(96552));
class CloudRunnerCustomSteps { class CloudRunnerCustomSteps {
static GetCustomStepsFromFiles(hookLifecycle) { static GetCustomStepsFromFiles(hookLifecycle) {
const results = []; const results = [];
remote_client_logger_1.RemoteClientLogger.log(`GetCustomStepFiles: ${hookLifecycle}`); remote_client_logger_1.RemoteClientLogger.log(`GetCustomStepFiles: ${hookLifecycle} CustomStepFiles: ${cloud_runner_options_1.default.customStepFiles}`);
try { try {
const gameCiCustomStepsPath = path_1.default.join(process.cwd(), `game-ci`, `steps`); const gameCiCustomStepsPath = path_1.default.join(process.cwd(), `game-ci`, `steps`);
const files = fs.readdirSync(gameCiCustomStepsPath); const files = fs.readdirSync(gameCiCustomStepsPath);
for (const file of files) { for (const file of files) {
if (!cloud_runner_options_1.default.customStepFiles.includes(file.replace(`.yaml`, ``))) { if (!cloud_runner_options_1.default.customStepFiles.includes(file.replace(`.yaml`, ``))) {
remote_client_logger_1.RemoteClientLogger.log(`Skipping CustomStepFile: ${file} (not in ${cloud_runner_options_1.default.customStepFiles})`); remote_client_logger_1.RemoteClientLogger.log(`Skipping CustomStepFile: ${file}`);
continue; continue;
} }
const fileContents = fs.readFileSync(path_1.default.join(gameCiCustomStepsPath, file), `utf8`); const fileContents = fs.readFileSync(path_1.default.join(gameCiCustomStepsPath, file), `utf8`);

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

15
src/model/cli/shared-workspace-locking.ts
View File

@ -69,11 +69,12 @@ export class SharedWorkspaceLocking {
if (!(await SharedWorkspaceLocking.DoesWorkspaceExist(workspace, buildParametersContext))) { if (!(await SharedWorkspaceLocking.DoesWorkspaceExist(workspace, buildParametersContext))) {
return false; return false;
} }
CloudRunnerLogger.log(`Checking has workspace ${workspace} was locked`);
const locks = await SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext);
const includesRunLock = locks.filter((x) => x.includes(runId)).length > 0;
CloudRunnerLogger.log(`Locks ${locks}, includes ${includesRunLock}`);
return ( return includesRunLock;
(await SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext)).filter((x) => x.includes(runId))
.length > 0
);
} }
public static async GetFreeWorkspaces(buildParametersContext: BuildParameters): Promise<string[]> { public static async GetFreeWorkspaces(buildParametersContext: BuildParameters): Promise<string[]> {
@ -123,6 +124,12 @@ export class SharedWorkspaceLocking {
); );
fs.rmSync(file); fs.rmSync(file);
const workspaces = await SharedWorkspaceLocking.ReadLines(
`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`,
);
CloudRunnerLogger.log(`All workspaces ${workspaces}`);
return workspace; return workspace;
} }

6
src/model/cloud-runner/services/cloud-runner-custom-steps.ts
View File

@ -12,13 +12,15 @@ import CloudRunnerOptions from '../cloud-runner-options';
export class CloudRunnerCustomSteps { export class CloudRunnerCustomSteps {
static GetCustomStepsFromFiles(hookLifecycle: string): CustomStep[] { static GetCustomStepsFromFiles(hookLifecycle: string): CustomStep[] {
const results: CustomStep[] = []; const results: CustomStep[] = [];
RemoteClientLogger.log(`GetCustomStepFiles: ${hookLifecycle}`); RemoteClientLogger.log(
`GetCustomStepFiles: ${hookLifecycle} CustomStepFiles: ${CloudRunnerOptions.customStepFiles}`,
);
try { try {
const gameCiCustomStepsPath = path.join(process.cwd(), `game-ci`, `steps`); const gameCiCustomStepsPath = path.join(process.cwd(), `game-ci`, `steps`);
const files = fs.readdirSync(gameCiCustomStepsPath); const files = fs.readdirSync(gameCiCustomStepsPath);
for (const file of files) { for (const file of files) {
if (!CloudRunnerOptions.customStepFiles.includes(file.replace(`.yaml`, ``))) { if (!CloudRunnerOptions.customStepFiles.includes(file.replace(`.yaml`, ``))) {
RemoteClientLogger.log(`Skipping CustomStepFile: ${file} (not in ${CloudRunnerOptions.customStepFiles})`); RemoteClientLogger.log(`Skipping CustomStepFile: ${file}`);
continue; continue;
} }
const fileContents = fs.readFileSync(path.join(gameCiCustomStepsPath, file), `utf8`); const fileContents = fs.readFileSync(path.join(gameCiCustomStepsPath, file), `utf8`);