workspaces should be in one cache key folder
parent
bb652ab73c
commit
077b49da17
|
@ -5683,7 +5683,9 @@ class SharedWorkspaceLocking {
|
||||||
if (!(yield SharedWorkspaceLocking.DoesWorkspaceTopLevelExist(buildParametersContext))) {
|
if (!(yield SharedWorkspaceLocking.DoesWorkspaceTopLevelExist(buildParametersContext))) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
return (yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`)).map((x) => x.replace(`/`, ``));
|
return (yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`))
|
||||||
|
.map((x) => x.replace(`/`, ``))
|
||||||
|
.filter((x) => x.includes(`_workspace`));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
static DoesWorkspaceTopLevelExist(buildParametersContext) {
|
static DoesWorkspaceTopLevelExist(buildParametersContext) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -20,7 +20,9 @@ export class SharedWorkspaceLocking {
|
||||||
await SharedWorkspaceLocking.ReadLines(
|
await SharedWorkspaceLocking.ReadLines(
|
||||||
`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`,
|
`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`,
|
||||||
)
|
)
|
||||||
).map((x) => x.replace(`/`, ``));
|
)
|
||||||
|
.map((x) => x.replace(`/`, ``))
|
||||||
|
.filter((x) => x.includes(`_workspace`));
|
||||||
}
|
}
|
||||||
public static async DoesWorkspaceTopLevelExist(buildParametersContext: BuildParameters) {
|
public static async DoesWorkspaceTopLevelExist(buildParametersContext: BuildParameters) {
|
||||||
await SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceBucketRoot}`);
|
await SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceBucketRoot}`);
|
||||||
|
|
Loading…
Reference in New Issue