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

fix

pull/496/head
Frostebite 2023-02-12 04:26:31 +00:00
parent 825bb1ae77
commit 7e7bd11c7d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/index.js generated vendored
View File

@ -5701,7 +5701,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}_lock`));
}); });
} }
static GetOrCreateLockedWorkspace(workspace, runId, buildParametersContext) { static GetOrCreateLockedWorkspace(workspace, runId, buildParametersContext) {

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

File diff suppressed because one or more lines are too long

2
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}_lock`));
} }
public static async GetOrCreateLockedWorkspace( public static async GetOrCreateLockedWorkspace(
workspace: string, workspace: string,

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

@ -41,8 +41,9 @@ describe('Cloud Runner Locking', () => {
(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)) === false; (await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)) === false;
expect(isExpectedUnlockedBeforeLocking).toBeTruthy(); expect(isExpectedUnlockedBeforeLocking).toBeTruthy();
await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters); await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters);
expect(await SharedWorkspaceLocking.DoesCacheKeyTopLevelExist(buildParameters)).toBeTruthy();
expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy();
const allLocks = await SharedWorkspaceLocking.GetAllLocks(newWorkspaceName, buildParameters); const allLocks = await SharedWorkspaceLocking.GetAllLocks(newWorkspaceName, buildParameters);
expect(allLocks.filter((x) => x.includes(`${newWorkspaceName}_lock`))).toBeGreaterThan(0);
expect( expect(
( (
await SharedWorkspaceLocking.ReadLines( await SharedWorkspaceLocking.ReadLines(
@ -57,8 +58,7 @@ describe('Cloud Runner Locking', () => {
) )
).filter((x) => x.includes(`${newWorkspaceName}_workspace`)), ).filter((x) => x.includes(`${newWorkspaceName}_workspace`)),
).toBeGreaterThan(0); ).toBeGreaterThan(0);
expect(await SharedWorkspaceLocking.DoesCacheKeyTopLevelExist(buildParameters)).toBeTruthy(); expect(allLocks.filter((x) => x.includes(`${newWorkspaceName}_lock`))).toBeGreaterThan(0);
expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy();
const isExpectedLockedAfterLocking = const isExpectedLockedAfterLocking =
(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)) === true; (await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)) === true;
expect(isExpectedLockedAfterLocking).toBeTruthy(); expect(isExpectedLockedAfterLocking).toBeTruthy();