fixes
parent
a63d8c33e1
commit
e6fec96a1f
|
@ -1123,10 +1123,11 @@ class CloudRunner {
|
||||||
core.endGroup();
|
core.endGroup();
|
||||||
yield github_1.default.updateGitHubCheck(CloudRunner.buildParameters.buildGuid, `success`, `success`, `completed`);
|
yield github_1.default.updateGitHubCheck(CloudRunner.buildParameters.buildGuid, `success`, `success`, `completed`);
|
||||||
if (CloudRunner.buildParameters.retainWorkspace) {
|
if (CloudRunner.buildParameters.retainWorkspace) {
|
||||||
yield shared_workspace_locking_1.default.ReleaseWorkspace(CloudRunner.lockedWorkspace || ``, CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters);
|
const workspace = CloudRunner.lockedWorkspace || ``;
|
||||||
const isLocked = yield shared_workspace_locking_1.default.IsWorkspaceLocked(CloudRunner.lockedWorkspace || ``, CloudRunner.buildParameters);
|
yield shared_workspace_locking_1.default.ReleaseWorkspace(workspace, CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters);
|
||||||
|
const isLocked = yield shared_workspace_locking_1.default.IsWorkspaceLocked(workspace, CloudRunner.buildParameters);
|
||||||
if (isLocked) {
|
if (isLocked) {
|
||||||
throw new Error(`still locked after releasing ${yield shared_workspace_locking_1.default.GetAllLocksForWorkspace(CloudRunner.lockedWorkspace || ``, buildParameters)}`);
|
throw new Error(`still locked after releasing ${yield shared_workspace_locking_1.default.GetAllLocksForWorkspace(workspace, buildParameters)}`);
|
||||||
}
|
}
|
||||||
CloudRunner.lockedWorkspace = undefined;
|
CloudRunner.lockedWorkspace = undefined;
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -132,19 +132,17 @@ class CloudRunner {
|
||||||
await GitHub.updateGitHubCheck(CloudRunner.buildParameters.buildGuid, `success`, `success`, `completed`);
|
await GitHub.updateGitHubCheck(CloudRunner.buildParameters.buildGuid, `success`, `success`, `completed`);
|
||||||
|
|
||||||
if (CloudRunner.buildParameters.retainWorkspace) {
|
if (CloudRunner.buildParameters.retainWorkspace) {
|
||||||
|
const workspace = CloudRunner.lockedWorkspace || ``;
|
||||||
await SharedWorkspaceLocking.ReleaseWorkspace(
|
await SharedWorkspaceLocking.ReleaseWorkspace(
|
||||||
CloudRunner.lockedWorkspace || ``,
|
workspace,
|
||||||
CloudRunner.buildParameters.buildGuid,
|
CloudRunner.buildParameters.buildGuid,
|
||||||
CloudRunner.buildParameters,
|
CloudRunner.buildParameters,
|
||||||
);
|
);
|
||||||
const isLocked = await SharedWorkspaceLocking.IsWorkspaceLocked(
|
const isLocked = await SharedWorkspaceLocking.IsWorkspaceLocked(workspace, CloudRunner.buildParameters);
|
||||||
CloudRunner.lockedWorkspace || ``,
|
|
||||||
CloudRunner.buildParameters,
|
|
||||||
);
|
|
||||||
if (isLocked) {
|
if (isLocked) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`still locked after releasing ${await SharedWorkspaceLocking.GetAllLocksForWorkspace(
|
`still locked after releasing ${await SharedWorkspaceLocking.GetAllLocksForWorkspace(
|
||||||
CloudRunner.lockedWorkspace || ``,
|
workspace,
|
||||||
buildParameters,
|
buildParameters,
|
||||||
)}`,
|
)}`,
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue