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

extract lib in caching flow

pull/496/head
Frostebite 2023-02-13 17:51:14 +00:00
parent 5c64dd1ea0
commit f29a3cac01
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/index.js generated vendored
View File

@ -5706,7 +5706,7 @@ class SharedWorkspaceLocking {
} }
return (yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`)) return (yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`))
.map((x) => x.replace(`/`, ``)) .map((x) => x.replace(`/`, ``))
.filter((x) => x.includes(`${workspace}_lock`)); .filter((x) => x.includes(`${workspace}_workspace_lock`));
}); });
} }
static GetOrCreateLockedWorkspace(workspace, runId, buildParametersContext) { static GetOrCreateLockedWorkspace(workspace, runId, buildParametersContext) {
@ -5829,7 +5829,7 @@ class SharedWorkspaceLocking {
throw new Error(`Workspace file doesn't exist`); throw new Error(`Workspace file doesn't exist`);
} }
const lockFilesExist = files.filter((x) => { const lockFilesExist = files.filter((x) => {
return x.includes(`${workspace}_lock`); return x.includes(`${workspace}_workspace_lock`);
}).length > 0; }).length > 0;
return lockFilesExist; return lockFilesExist;
}); });
@ -5865,7 +5865,7 @@ class SharedWorkspaceLocking {
} }
static ReleaseWorkspace(workspace, runId, buildParametersContext) { static ReleaseWorkspace(workspace, runId, buildParametersContext) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const file = (yield SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext)).filter((x) => x.includes(`_${runId}_${workspace}_lock`)); const file = (yield SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext)).filter((x) => x.includes(`_${runId}_${workspace}_workspace_lock`));
cloud_runner_logger_1.default.log(`Deleting lock ${workspace}/${file}`); cloud_runner_logger_1.default.log(`Deleting lock ${workspace}/${file}`);
cloud_runner_logger_1.default.log(`rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`); cloud_runner_logger_1.default.log(`rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`aws s3 rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`, false, true); yield cloud_runner_system_1.CloudRunnerSystem.Run(`aws s3 rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`, false, true);

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

6
src/model/cloud-runner/services/shared-workspace-locking.ts
View File

@ -40,7 +40,7 @@ export class SharedWorkspaceLocking {
) )
) )
.map((x) => x.replace(`/`, ``)) .map((x) => x.replace(`/`, ``))
.filter((x) => x.includes(`${workspace}_lock`)); .filter((x) => x.includes(`${workspace}_workspace_lock`));
} }
public static async GetOrCreateLockedWorkspace( public static async GetOrCreateLockedWorkspace(
workspace: string, workspace: string,
@ -202,7 +202,7 @@ export class SharedWorkspaceLocking {
const lockFilesExist = const lockFilesExist =
files.filter((x) => { files.filter((x) => {
return x.includes(`${workspace}_lock`); return x.includes(`${workspace}_workspace_lock`);
}).length > 0; }).length > 0;
return lockFilesExist; return lockFilesExist;
@ -262,7 +262,7 @@ export class SharedWorkspaceLocking {
buildParametersContext: BuildParameters, buildParametersContext: BuildParameters,
): Promise<boolean> { ): Promise<boolean> {
const file = (await SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext)).filter((x) => const file = (await SharedWorkspaceLocking.GetAllLocks(workspace, buildParametersContext)).filter((x) =>
x.includes(`_${runId}_${workspace}_lock`), x.includes(`_${runId}_${workspace}_workspace_lock`),
); );
CloudRunnerLogger.log(`Deleting lock ${workspace}/${file}`); CloudRunnerLogger.log(`Deleting lock ${workspace}/${file}`);
CloudRunnerLogger.log(`rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`); CloudRunnerLogger.log(`rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`);