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

fixes

pull/496/head
Frostebite 2023-02-17 21:45:26 +00:00
parent 5883a1b190
commit 310e27cd66
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/index.js generated vendored
View File

@ -5740,8 +5740,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.endsWith(`_workspace`)) .filter((x) => x.endsWith(`_workspace`));
.map((x) => x.split(`_`)[1]);
}); });
} }
static DoesCacheKeyTopLevelExist(buildParametersContext) { static DoesCacheKeyTopLevelExist(buildParametersContext) {
@ -5868,6 +5867,9 @@ class SharedWorkspaceLocking {
return false; return false;
} }
const files = yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`); const files = yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`);
if (workspace.includes(`_`)) {
workspace = workspace.split(`_`)[1];
}
const lockFilesExist = files.filter((x) => { const lockFilesExist = files.filter((x) => {
return x.includes(workspace) && x.endsWith(`_lock`); return x.includes(workspace) && x.endsWith(`_lock`);
}).length > 0; }).length > 0;

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

File diff suppressed because one or more lines are too long

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

@ -22,8 +22,7 @@ export class SharedWorkspaceLocking {
) )
) )
.map((x) => x.replace(`/`, ``)) .map((x) => x.replace(`/`, ``))
.filter((x) => x.endsWith(`_workspace`)) .filter((x) => x.endsWith(`_workspace`));
.map((x) => x.split(`_`)[1]);
} }
public static async DoesCacheKeyTopLevelExist(buildParametersContext: BuildParameters) { public static async DoesCacheKeyTopLevelExist(buildParametersContext: BuildParameters) {
const lines = await SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}`); const lines = await SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}`);
@ -193,6 +192,10 @@ export class SharedWorkspaceLocking {
`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`, `aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`,
); );
if (workspace.includes(`_`)) {
workspace = workspace.split(`_`)[1];
}
const lockFilesExist = const lockFilesExist =
files.filter((x) => { files.filter((x) => {
return x.includes(workspace) && x.endsWith(`_lock`); return x.includes(workspace) && x.endsWith(`_lock`);