fixes
parent
5883a1b190
commit
310e27cd66
|
@ -5740,8 +5740,7 @@ class SharedWorkspaceLocking {
|
|||
}
|
||||
return (yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`))
|
||||
.map((x) => x.replace(`/`, ``))
|
||||
.filter((x) => x.endsWith(`_workspace`))
|
||||
.map((x) => x.split(`_`)[1]);
|
||||
.filter((x) => x.endsWith(`_workspace`));
|
||||
});
|
||||
}
|
||||
static DoesCacheKeyTopLevelExist(buildParametersContext) {
|
||||
|
@ -5868,6 +5867,9 @@ class SharedWorkspaceLocking {
|
|||
return false;
|
||||
}
|
||||
const files = yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`);
|
||||
if (workspace.includes(`_`)) {
|
||||
workspace = workspace.split(`_`)[1];
|
||||
}
|
||||
const lockFilesExist = files.filter((x) => {
|
||||
return x.includes(workspace) && x.endsWith(`_lock`);
|
||||
}).length > 0;
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -22,8 +22,7 @@ export class SharedWorkspaceLocking {
|
|||
)
|
||||
)
|
||||
.map((x) => x.replace(`/`, ``))
|
||||
.filter((x) => x.endsWith(`_workspace`))
|
||||
.map((x) => x.split(`_`)[1]);
|
||||
.filter((x) => x.endsWith(`_workspace`));
|
||||
}
|
||||
public static async DoesCacheKeyTopLevelExist(buildParametersContext: BuildParameters) {
|
||||
const lines = await SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}`);
|
||||
|
@ -193,6 +192,10 @@ export class SharedWorkspaceLocking {
|
|||
`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`,
|
||||
);
|
||||
|
||||
if (workspace.includes(`_`)) {
|
||||
workspace = workspace.split(`_`)[1];
|
||||
}
|
||||
|
||||
const lockFilesExist =
|
||||
files.filter((x) => {
|
||||
return x.includes(workspace) && x.endsWith(`_lock`);
|
||||
|
|
Loading…
Reference in New Issue