[CloudRunner] actions yaml descriptions

pull/437/head
Frostebite 2022-10-23 00:22:27 +01:00
parent 8fa45121ef
commit 6258d1fe53
3 changed files with 25 additions and 26 deletions

24
dist/index.js vendored
View File

@ -5192,14 +5192,17 @@ class SharedWorkspaceLocking {
if (!cloud_runner_options_1.default.retainWorkspaces) { if (!cloud_runner_options_1.default.retainWorkspaces) {
return; return;
} }
const workspaces = yield SharedWorkspaceLocking.GetFreeWorkspaces(buildParametersContext); if (yield SharedWorkspaceLocking.DoesWorkspaceTopLevelExist(buildParametersContext)) {
cloud_runner_logger_1.default.log(`run agent ${runId} is trying to access a workspace, free: ${JSON.stringify(workspaces)}`); const workspaces = yield SharedWorkspaceLocking.GetFreeWorkspaces(buildParametersContext);
for (const element of workspaces) { cloud_runner_logger_1.default.log(`run agent ${runId} is trying to access a workspace, free: ${JSON.stringify(workspaces)}`);
const lockResult = yield SharedWorkspaceLocking.LockWorkspace(element, runId, buildParametersContext); for (const element of workspaces) {
cloud_runner_logger_1.default.log(`run agent: ${runId} try lock workspace: ${element} result: ${lockResult}`); yield new Promise((promise) => setTimeout(promise, 1000));
if (lockResult) { const lockResult = yield SharedWorkspaceLocking.LockWorkspace(element, runId, buildParametersContext);
cloud_runner_1.default.lockedWorkspace = element; cloud_runner_logger_1.default.log(`run agent: ${runId} try lock workspace: ${element} result: ${lockResult}`);
return true; if (lockResult) {
cloud_runner_1.default.lockedWorkspace = element;
return true;
}
} }
} }
const createResult = yield SharedWorkspaceLocking.CreateWorkspace(workspace, buildParametersContext, runId); const createResult = yield SharedWorkspaceLocking.CreateWorkspace(workspace, buildParametersContext, runId);
@ -5236,7 +5239,7 @@ class SharedWorkspaceLocking {
const result = []; const result = [];
const workspaces = yield SharedWorkspaceLocking.GetAllWorkspaces(buildParametersContext); const workspaces = yield SharedWorkspaceLocking.GetAllWorkspaces(buildParametersContext);
for (const element of workspaces) { for (const element of workspaces) {
yield new Promise((promise) => setTimeout(promise, 1000)); yield new Promise((promise) => setTimeout(promise, 1500));
if (!(yield SharedWorkspaceLocking.IsWorkspaceLocked(element, buildParametersContext)) && if (!(yield SharedWorkspaceLocking.IsWorkspaceLocked(element, buildParametersContext)) &&
(yield SharedWorkspaceLocking.IsWorkspaceBelowMax(``, buildParametersContext))) { (yield SharedWorkspaceLocking.IsWorkspaceBelowMax(``, buildParametersContext))) {
result.push(element); result.push(element);
@ -5247,9 +5250,6 @@ class SharedWorkspaceLocking {
} }
static IsWorkspaceBelowMax(workspace, buildParametersContext) { static IsWorkspaceBelowMax(workspace, buildParametersContext) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
if (!(yield SharedWorkspaceLocking.DoesWorkspaceTopLevelExist(buildParametersContext))) {
return true;
}
const workspaces = yield SharedWorkspaceLocking.GetAllWorkspaces(buildParametersContext); const workspaces = yield SharedWorkspaceLocking.GetAllWorkspaces(buildParametersContext);
if (workspace === ``) { if (workspace === ``) {
return (workspaces.length < buildParametersContext.maxRetainedWorkspaces || return (workspaces.length < buildParametersContext.maxRetainedWorkspaces ||

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -49,17 +49,19 @@ export class SharedWorkspaceLocking {
if (!CloudRunnerOptions.retainWorkspaces) { if (!CloudRunnerOptions.retainWorkspaces) {
return; return;
} }
if (await SharedWorkspaceLocking.DoesWorkspaceTopLevelExist(buildParametersContext)) {
const workspaces = await SharedWorkspaceLocking.GetFreeWorkspaces(buildParametersContext);
CloudRunnerLogger.log(`run agent ${runId} is trying to access a workspace, free: ${JSON.stringify(workspaces)}`);
for (const element of workspaces) {
await new Promise((promise) => setTimeout(promise, 1000));
const lockResult = await SharedWorkspaceLocking.LockWorkspace(element, runId, buildParametersContext);
CloudRunnerLogger.log(`run agent: ${runId} try lock workspace: ${element} result: ${lockResult}`);
const workspaces = await SharedWorkspaceLocking.GetFreeWorkspaces(buildParametersContext); if (lockResult) {
CloudRunnerLogger.log(`run agent ${runId} is trying to access a workspace, free: ${JSON.stringify(workspaces)}`); CloudRunner.lockedWorkspace = element;
for (const element of workspaces) {
const lockResult = await SharedWorkspaceLocking.LockWorkspace(element, runId, buildParametersContext);
CloudRunnerLogger.log(`run agent: ${runId} try lock workspace: ${element} result: ${lockResult}`);
if (lockResult) { return true;
CloudRunner.lockedWorkspace = element; }
return true;
} }
} }
@ -105,7 +107,7 @@ export class SharedWorkspaceLocking {
const result: string[] = []; const result: string[] = [];
const workspaces = await SharedWorkspaceLocking.GetAllWorkspaces(buildParametersContext); const workspaces = await SharedWorkspaceLocking.GetAllWorkspaces(buildParametersContext);
for (const element of workspaces) { for (const element of workspaces) {
await new Promise((promise) => setTimeout(promise, 1000)); await new Promise((promise) => setTimeout(promise, 1500));
if ( if (
!(await SharedWorkspaceLocking.IsWorkspaceLocked(element, buildParametersContext)) && !(await SharedWorkspaceLocking.IsWorkspaceLocked(element, buildParametersContext)) &&
(await SharedWorkspaceLocking.IsWorkspaceBelowMax(``, buildParametersContext)) (await SharedWorkspaceLocking.IsWorkspaceBelowMax(``, buildParametersContext))
@ -121,9 +123,6 @@ export class SharedWorkspaceLocking {
workspace: string, workspace: string,
buildParametersContext: BuildParameters, buildParametersContext: BuildParameters,
): Promise<boolean> { ): Promise<boolean> {
if (!(await SharedWorkspaceLocking.DoesWorkspaceTopLevelExist(buildParametersContext))) {
return true;
}
const workspaces = await SharedWorkspaceLocking.GetAllWorkspaces(buildParametersContext); const workspaces = await SharedWorkspaceLocking.GetAllWorkspaces(buildParametersContext);
if (workspace === ``) { if (workspace === ``) {
return ( return (