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

locking 2nd time

pull/496/head
Frostebite 2023-02-13 19:11:02 +00:00
parent 0bc0c4d8fb
commit de525aef53
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/index.js generated vendored
View File

@ -5712,7 +5712,7 @@ class SharedWorkspaceLocking {
static GetOrCreateLockedWorkspace(workspace, runId, buildParametersContext) { static GetOrCreateLockedWorkspace(workspace, runId, buildParametersContext) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
if (!cloud_runner_options_1.default.retainWorkspaces) { if (!cloud_runner_options_1.default.retainWorkspaces) {
return; return false;
} }
try { try {
if (yield SharedWorkspaceLocking.DoesCacheKeyTopLevelExist(buildParametersContext)) { if (yield SharedWorkspaceLocking.DoesCacheKeyTopLevelExist(buildParametersContext)) {
@ -5730,7 +5730,7 @@ class SharedWorkspaceLocking {
} }
} }
catch (_a) { catch (_a) {
return; return false;
} }
const createResult = yield SharedWorkspaceLocking.CreateWorkspace(workspace, buildParametersContext, runId); const createResult = yield SharedWorkspaceLocking.CreateWorkspace(workspace, buildParametersContext, runId);
cloud_runner_logger_1.default.log(`run agent ${runId} didn't find a free workspace so created: ${workspace} createWorkspaceSuccess: ${createResult}`); cloud_runner_logger_1.default.log(`run agent ${runId} didn't find a free workspace so created: ${workspace} createWorkspaceSuccess: ${createResult}`);

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

File diff suppressed because one or more lines are too long

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

@ -48,7 +48,7 @@ export class SharedWorkspaceLocking {
buildParametersContext: BuildParameters, buildParametersContext: BuildParameters,
) { ) {
if (!CloudRunnerOptions.retainWorkspaces) { if (!CloudRunnerOptions.retainWorkspaces) {
return; return false;
} }
try { try {
@ -70,7 +70,7 @@ export class SharedWorkspaceLocking {
} }
} }
} catch { } catch {
return; return false;
} }
const createResult = await SharedWorkspaceLocking.CreateWorkspace(workspace, buildParametersContext, runId); const createResult = await SharedWorkspaceLocking.CreateWorkspace(workspace, buildParametersContext, runId);

12
src/model/cloud-runner/tests/cloud-runner-locking.test.ts
View File

@ -76,9 +76,15 @@ describe('Cloud Runner Locking', () => {
expect(isExpectedNotLockedAfterReleasing).toBeTruthy(); expect(isExpectedNotLockedAfterReleasing).toBeTruthy();
const lockingResult2 = await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters); const lockingResult2 = await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters);
expect(lockingResult2).toBeTruthy(); expect(lockingResult2).toBeTruthy();
const isExpectedLockedAgainAfterReleasing = expect((await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)) === true).toBeTruthy();
(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)) === false; await SharedWorkspaceLocking.ReleaseWorkspace(newWorkspaceName, runId, buildParameters);
expect(isExpectedLockedAgainAfterReleasing).toBeTruthy(); expect(
(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)) === false,
).toBeTruthy();
await SharedWorkspaceLocking.CleanupWorkspace(newWorkspaceName, buildParameters);
expect(
await SharedWorkspaceLocking.GetOrCreateLockedWorkspace(newWorkspaceName, runId, buildParameters),
).toBeTruthy();
}, 150000); }, 150000);
it.skip('All Locking Actions', async () => { it.skip('All Locking Actions', async () => {
Cli.options.retainWorkspaces = true; Cli.options.retainWorkspaces = true;