@clickview/ship-it 0.0.4-dev.5 → 0.0.4

package/lib/src/api-clients/git-lab/GitLabApiClient.js

@@ -122,6 +122,58 @@ var GitLabApiClient = /** @class */ (function () {
             });
         });
     };
+    GitLabApiClient.prototype.getTag = function (projectId, tagName) {
+        return __awaiter(this, void 0, void 0, function () {
+            var tag, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, this.client.Tags.show(projectId, tagName)];
+                    case 1:
+                        tag = _b.sent();
+                        return [2 /*return*/, GitLabMapper_1.GitLabMapper.tag(tag)];
+                    case 2:
+                        _a = _b.sent();
+                        return [2 /*return*/, null];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    GitLabApiClient.prototype.createTag = function (projectId, tagName, sha) {
+        return __awaiter(this, void 0, void 0, function () {
+            var tag;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.client.Tags.create(projectId, tagName, sha)];
+                    case 1:
+                        tag = _a.sent();
+                        return [2 /*return*/, GitLabMapper_1.GitLabMapper.tag(tag)];
+                }
+            });
+        });
+    };
+    GitLabApiClient.prototype.createRelease = function (projectId, release) {
+        return __awaiter(this, void 0, void 0, function () {
+            var newRelease;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.client.Releases.create(projectId, {
+                            id: projectId,
+                            name: release.name,
+                            tag_name: release.tag,
+                            description: release.description,
+                            ref: release.ref,
+                            milestones: release.milestones
+                        })];
+                    case 1:
+                        newRelease = _a.sent();
+                        return [2 /*return*/, GitLabMapper_1.GitLabMapper.release(newRelease)];
+                }
+            });
+        });
+    };
     GitLabApiClient.prototype.getCommitsSince = function (projectId, branchName, sinceSha) {
         return __awaiter(this, void 0, void 0, function () {
             var commit, commits;
@@ -331,6 +383,19 @@ var GitLabApiClient = /** @class */ (function () {
             });
         });
     };
+    GitLabApiClient.prototype.getLabels = function (projectId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var labels;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.client.Labels.all(projectId)];
+                    case 1:
+                        labels = _a.sent();
+                        return [2 /*return*/, labels.map(GitLabMapper_1.GitLabMapper.label)];
+                }
+            });
+        });
+    };
     GitLabApiClient = __decorate([
         (0, inversify_1.injectable)(),
         __param(0, (0, inversify_1.inject)(types_1.MISC.GitLabConfig)),

package/lib/src/api-clients/git-lab/GitLabMapper.js

@@ -16,7 +16,8 @@ exports.GitLabMapper = {
             hasConflicts: m.has_conflicts,
             targetBranch: m.target_branch,
             sourceBranch: m.source_branch,
-            milestone: exports.GitLabMapper.milestone(m.milestone)
+            milestone: exports.GitLabMapper.milestone(m.milestone),
+            labels: m.labels
         };
     },
     project: function (p) {
@@ -57,5 +58,21 @@ exports.GitLabMapper = {
             id: m.id,
             name: m.title
         };
+    },
+    label: function (m) {
+        return {
+            name: m.name,
+            description: m.description
+        };
+    },
+    release: function (m) {
+        var _a;
+        return {
+            name: m.name,
+            tag: m.tag_name,
+            description: m.description,
+            ref: m.commit.id,
+            milestones: (_a = m.milestones) === null || _a === void 0 ? void 0 : _a.map(function (m) { return m.title; })
+        };
     }
 };

package/lib/src/commands/ReleaseCommand.js

@@ -79,31 +79,35 @@ var ReleaseCommand = /** @class */ (function () {
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/, false];
-                        // cont = await this.validateDescriptionsTask.run(options);
+                        return [4 /*yield*/, this.validateDescriptionsTask.run(options)];
+                    case 3:
+                        cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/, false];
-                        // cont = await this.validateCommitsTask.run(options);
+                        return [4 /*yield*/, this.validateCommitsTask.run(options)];
+                    case 4:
+                        cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/, false];
                         return [4 /*yield*/, this.createBranchTask.run(options)];
-                    case 3:
+                    case 5:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/, false];
                         return [4 /*yield*/, this.bumpVersionTxtTask.run(options)];
-                    case 4:
+                    case 6:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/, false];
                         return [4 /*yield*/, this.createMergeRequestTask.run(options)];
-                    case 5:
+                    case 7:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/, false];
                         if (!options.triggerMonorepoBuild)
-                            return [2 /*return*/, false];
+                            return [2 /*return*/, true];
                         return [4 /*yield*/, this.startMonorepoBuildTask.run(options)];
-                    case 6: return [2 /*return*/, _a.sent()];
+                    case 8: return [2 /*return*/, _a.sent()];
                 }
             });
         });

package/lib/src/commands/{CommitPackageVersionsCommand.js → TagMasterCommand.js}

@@ -48,31 +48,29 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommitPackageVersionsCommand = void 0;
+exports.TagMasterCommand = void 0;
 require("reflect-metadata");
 var inversify_1 = require("inversify");
-var types_1 = require("types");
-var CommitPackageVersionsCommand = /** @class */ (function () {
-    function CommitPackageVersionsCommand(commitPackageVersionsTask) {
-        this.commitPackageVersionsTask = commitPackageVersionsTask;
+var types_1 = require("../types");
+var TagMasterCommand = /** @class */ (function () {
+    function TagMasterCommand(tagMasterTask) {
+        this.tagMasterTask = tagMasterTask;
     }
-    CommitPackageVersionsCommand.prototype.run = function (options) {
+    TagMasterCommand.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.commitPackageVersionsTask.run(options)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                    case 0: return [4 /*yield*/, this.tagMasterTask.run(options)];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
-    CommitPackageVersionsCommand = __decorate([
+    TagMasterCommand = __decorate([
         (0, inversify_1.injectable)(),
-        __param(0, (0, inversify_1.inject)(types_1.TASKS.CommitPackageVersionsTask)),
+        __param(0, (0, inversify_1.inject)(types_1.TASKS.TagMasterTask)),
         __metadata("design:paramtypes", [Object])
-    ], CommitPackageVersionsCommand);
-    return CommitPackageVersionsCommand;
+    ], TagMasterCommand);
+    return TagMasterCommand;
 }());
-exports.CommitPackageVersionsCommand = CommitPackageVersionsCommand;
+exports.TagMasterCommand = TagMasterCommand;

package/lib/src/commands/index.js

@@ -22,5 +22,6 @@ __exportStar(require("./InstallPackagesCommand"), exports);
 __exportStar(require("./ReleaseCommand"), exports);
 __exportStar(require("./StartConsumingProjectBuildsCommand"), exports);
 __exportStar(require("./StatusCommand"), exports);
+__exportStar(require("./TagMasterCommand"), exports);
 __exportStar(require("./ValidateMergeRequestCommand"), exports);
 __exportStar(require("./VersionCommand"), exports);

package/lib/src/constants/CommandTypeMapping.js

@@ -11,6 +11,7 @@ exports.CommandTypeMapping = {
     'create-notes': types_1.COMMANDS.CreateReleaseNotesCommand,
     'install-packages': types_1.COMMANDS.InstallPackagesCommand,
     'bump-packages': types_1.COMMANDS.BumpPackagesCommand,
+    'validate-mr': types_1.COMMANDS.ValidateMergeRequestCommand,
     'start-consuming-project-builds': types_1.COMMANDS.StartConsumingProjectBuildsCommand,
-    'validate-mr': types_1.COMMANDS.ValidateMergeRequestCommand
+    'tag-master': types_1.COMMANDS.TagMasterCommand
 };

package/lib/src/interfaces/models/index.js

@@ -18,7 +18,9 @@ __exportStar(require("./Branch"), exports);
 __exportStar(require("./Commit"), exports);
 __exportStar(require("./CommitFile"), exports);
 __exportStar(require("./File"), exports);
+__exportStar(require("./Label"), exports);
 __exportStar(require("./MergeRequest"), exports);
 __exportStar(require("./Milestone"), exports);
 __exportStar(require("./Project"), exports);
+__exportStar(require("./Release"), exports);
 __exportStar(require("./Tag"), exports);

package/lib/src/inversify.config.js

@@ -40,6 +40,7 @@ function createContainer(config) {
     container.bind(types_1.TASKS.CommitPackageVersionsTask).to(tasks_1.CommitPackageVersionsTask);
     container.bind(types_1.TASKS.ValidateMergeRequestTask).to(tasks_1.ValidateMergeRequestTask);
     container.bind(types_1.TASKS.StartMonorepoBuildTask).to(tasks_1.StartMonorepoBuildTask);
+    container.bind(types_1.TASKS.TagMasterTask).to(tasks_1.TagMasterTask);
     container.bind(types_1.TASKS.StartConsumingProjectBuildsTask)
         .to(tasks_1.StartConsumingProjectBuildsTask);
     /**
@@ -54,6 +55,7 @@ function createContainer(config) {
     container.bind(types_1.COMMANDS.InstallPackagesCommand).to(commands_1.InstallPackagesCommand);
     container.bind(types_1.COMMANDS.BumpPackagesCommand).to(commands_1.BumpPackagesCommand);
     container.bind(types_1.COMMANDS.ValidateMergeRequestCommand).to(commands_1.ValidateMergeRequestCommand);
+    container.bind(types_1.COMMANDS.TagMasterCommand).to(commands_1.TagMasterCommand);
     container.bind(types_1.COMMANDS.StartConsumingProjectBuildsCommand)
         .to(commands_1.StartConsumingProjectBuildsCommand);
     return container;

package/lib/src/services/GitLabService.js

@@ -71,13 +71,19 @@ var types_1 = require("../types");
 var api_clients_1 = require("../api-clients");
 var errors_1 = require("../errors");
 var utils_1 = require("../utils");
+/**
+ * These are projects that will try to use tags to pull in extra projects
+ */
+var MONOREPO_IDS = [
+    utils_1.ProjectIds.MONOREPO_PROJECT_ID
+];
 var GitLabService = /** @class */ (function () {
     function GitLabService(apiClient) {
         this.apiClient = apiClient;
     }
     GitLabService.prototype.getProjects = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var mergeRequests, projectIds, projects;
+            var allMergeRequests, mergeRequests, projectIds, projects, mappedProjects, _i, mappedProjects_1, mappedProject, extraProjects;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -85,7 +91,8 @@ var GitLabService = /** @class */ (function () {
                             return [2 /*return*/, this.projects];
                         return [4 /*yield*/, this.apiClient.getMergeRequests(options)];
                     case 1:
-                        mergeRequests = _a.sent();
+                        allMergeRequests = _a.sent();
+                        mergeRequests = allMergeRequests.filter(function (mr) { return mr.targetBranch !== 'master'; });
                         if (!(mergeRequests === null || mergeRequests === void 0 ? void 0 : mergeRequests.length))
                             throw new errors_1.ShipItError('Could not find any merge requests for the specified options');
                         projectIds = lodash_1.default.uniqBy(mergeRequests, function (m) { return m.projectId; }).map(function (m) { return m.projectId; });
@@ -94,7 +101,72 @@ var GitLabService = /** @class */ (function () {
                         projects = _a.sent();
                         if (!(projects === null || projects === void 0 ? void 0 : projects.length) || projects.length !== projectIds.length)
                             throw new errors_1.ShipItError('Could not find all projects for the found merge requests');
-                        return [2 /*return*/, (this.projects = projects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: mergeRequests.filter(function (mr) { return mr.projectId === p.id; }) })); }))];
+                        mappedProjects = projects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: mergeRequests.filter(function (mr) { return mr.projectId === p.id; }) })); });
+                        _i = 0, mappedProjects_1 = mappedProjects;
+                        _a.label = 3;
+                    case 3:
+                        if (!(_i < mappedProjects_1.length)) return [3 /*break*/, 6];
+                        mappedProject = mappedProjects_1[_i];
+                        return [4 /*yield*/, this.getExtraProjects(mappedProject, projectIds)];
+                    case 4:
+                        extraProjects = _a.sent();
+                        Array.prototype.push.apply(mappedProjects, extraProjects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: [] })); }));
+                        _a.label = 5;
+                    case 5:
+                        _i++;
+                        return [3 /*break*/, 3];
+                    case 6: return [2 /*return*/, (this.projects = mappedProjects)];
+                }
+            });
+        });
+    };
+    /**
+     * Fetches any projects that are not already included via MRs by checking the project labels.
+     * We only do this for a whitelist of projects
+     */
+    GitLabService.prototype.getExtraProjects = function (project, existingProjectIds) {
+        return __awaiter(this, void 0, void 0, function () {
+            var labels, mrLabelNames, mrLabels, projectIds, extraProjectIds;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!MONOREPO_IDS.includes(project.id.toString()))
+                            return [2 /*return*/, []];
+                        return [4 /*yield*/, this.getProjectLabels(project.id)];
+                    case 1:
+                        labels = _a.sent();
+                        mrLabelNames = lodash_1.default.chain(project.mergeRequests)
+                            .map(function (m) { return m.labels; })
+                            .flatten()
+                            .uniq()
+                            .value();
+                        mrLabels = lodash_1.default.intersection(labels.map(function (l) { return l.name; }), mrLabelNames);
+                        projectIds = mrLabels.map(function (m) { var _a; return (_a = labels.find(function (l) { return l.name === m; })) === null || _a === void 0 ? void 0 : _a.description; });
+                        extraProjectIds = lodash_1.default.difference(projectIds, existingProjectIds.map(function (p) { return p.toString(); }));
+                        return [4 /*yield*/, this.apiClient.getProjectsByIds(extraProjectIds)];
+                    case 2: 
+                    // fetches and returns the extra projects
+                    return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    /**
+     * Gets labels that have a projectId as their description
+     */
+    GitLabService.prototype.getProjectLabels = function (projectId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var labels;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.apiClient.getLabels(projectId)];
+                    case 1:
+                        labels = _a.sent();
+                        return [2 /*return*/, labels.filter(function (l) {
+                                if (!l.description)
+                                    return false;
+                                return !isNaN(+l.description);
+                            })];
                 }
             });
         });
@@ -129,8 +201,13 @@ var GitLabService = /** @class */ (function () {
                             (title === null || title === void 0 ? void 0 : title.includes('dev'))) {
                             commits.pop();
                         }
-                        if (!(commits === null || commits === void 0 ? void 0 : commits.length))
-                            throw new errors_1.ShipItError("Could not find any commits in dev for projectId: ".concat(projectId, " since ").concat(sinceSha));
+                        /**
+                         * This is commented out right now because of a problem with the logic of this approach of validating MRs.
+                         * We need to find a way to fetch all commits that will be included in this release. Leaving this commented
+                         * until we figure that out - Sha
+                         */
+                        // if (!commits?.length)
+                        //   throw new ShipItError(`Could not find any commits in dev for projectId: ${projectId} since ${sinceSha}`);
                         return [2 /*return*/, commits];
                 }
             });
@@ -181,10 +258,9 @@ var GitLabService = /** @class */ (function () {
         return this.apiClient.getMergeRequest(projectId, branchName, 'master');
     };
     GitLabService.prototype.getMergeRequestById = function (projectId, mergeRequestId) {
-        var idAsNumber = lodash_1.default.toNumber(mergeRequestId);
-        if (!lodash_1.default.isNumber(idAsNumber))
+        if (isNaN(+mergeRequestId))
             throw new errors_1.ShipItError("MergeRequest Id must be a number: ".concat(mergeRequestId));
-        return this.apiClient.getMergeRequestById(projectId, idAsNumber);
+        return this.apiClient.getMergeRequestById(projectId, +mergeRequestId);
     };
     GitLabService.prototype.createMergeRequest = function (projectId, branchName, description, milestoneName) {
         return __awaiter(this, void 0, void 0, function () {
@@ -282,6 +358,36 @@ var GitLabService = /** @class */ (function () {
             });
         });
     };
+    GitLabService.prototype.getTag = function (projectId, tagName) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.apiClient.getTag(projectId, tagName)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    GitLabService.prototype.createTag = function (projectId, tagName, sha) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.apiClient.createTag(projectId, tagName, sha)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    GitLabService.prototype.createRelease = function (projectId, release) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.apiClient.createRelease(projectId, release)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
     /**
      * We use the latest valid semver tag in master to determine what the current version
      * of a project is

package/lib/src/startup/SetupCommands.js

@@ -64,6 +64,7 @@ function setupCommands(program, container) {
     addMilestoneCommand('create-branches', 'Create release branches for all projects that are part of a milestone');
     addMilestoneCommand('create-mrs', 'Create merge requests for all projects that are part of a milestone');
     addMilestoneCommand('create-notes', 'Builds descriptions for all projects that are part of a milestone');
+    addMilestoneCommand('tag-master', 'Tags master for all release MRs that are part of a milestone');
     program.command('release')
         .description('Create releases for all projects that are part of a milestone')
         .requiredOption('-m, --milestone <milestone>')
@@ -71,12 +72,17 @@ function setupCommands(program, container) {
         .option('--hotfix')
         .option('--major')
         .option('--trigger-monorepo-build')
-        .action(function (options) { return __awaiter(_this, void 0, void 0, function () {
-        var milestoneCommandOptions, releaseCommandOptions;
+        .action(function (opts) { return __awaiter(_this, void 0, void 0, function () {
+        var options;
         return __generator(this, function (_a) {
-            milestoneCommandOptions = (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(lodash_1.default.omit(options, 'triggerMonorepoBuild'));
-            releaseCommandOptions = __assign(__assign({}, milestoneCommandOptions), { triggerMonorepoBuild: !!options.triggerMonorepoBuild });
-            return [2 /*return*/, getAction('release')(releaseCommandOptions)];
+            switch (_a.label) {
+                case 0:
+                    options = __assign(__assign({}, (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(lodash_1.default.omit(opts, 'triggerMonorepoBuild'))), { triggerMonorepoBuild: !!opts.triggerMonorepoBuild });
+                    return [4 /*yield*/, getAction('release')(options)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
         });
     }); });
     program.command('bump-packages')
@@ -87,19 +93,25 @@ function setupCommands(program, container) {
     program.command('install-packages')
         .description('Install the latest clickview npm packages in all consuming projects that are part of a milestone')
         .option('-m, --milestone <milestone>')
-        .option('-b, --branchName <monorepoBranchName>')
+        .option('-b, --monorepoBranchName <monorepoBranchName>')
         .option('-p, --projectIds <projectIds...>')
         .action(getAction('install-packages'));
+    program.command('validate-mr')
+        .description('Validate a merge request in a single project, ensuring it has a milestone and valid description')
+        .option('-p, --projectId <projectId>')
+        .option('-b, --branchName <branchName>')
+        .action(getAction('validate-mr'));
+    program.command('start-consuming-project-builds')
+        .description('Trigger TeamCity builds in all consuming projects that are a part of a milestone')
+        .option('-m, --milestone <milestone>')
+        .option('--monorepoBranchName <monorepoBranchName>')
+        .option('-p, --projectIds <projectIds...>')
+        .action(getAction('start-consuming-project-builds'));
     program.command('start-consuming-project-builds')
         .description('Trigger TeamCity builds in all consuming projects that are a part of a milestone')
         .option('-m, --milestone <milestone>')
         .option('--monorepoBranchName <monorepoBranchName>')
         .option('-p, --projectIds <projectIds...>')
         .action(getAction('start-consuming-project-builds'));
-    program.command('validate-mr')
-        .description('Validate a merge request in a single project, ensuring it has a milestone and valid description')
-        .option('-p, --projectId <projectId>')
-        .option('-b, --branchName <branchName>')
-        .action(getAction('validate-mr'));
 }
 exports.setupCommands = setupCommands;

package/lib/src/tasks/BumpPackagesTask.js

@@ -89,12 +89,11 @@ var BumpPackagesTask = /** @class */ (function () {
                         return [4 /*yield*/, this.getLernaCommand(options)];
                     case 2:
                         lernaVersionCmd = _a.sent();
-                        console.log("Found lerna command ".concat(lernaVersionCmd, " but running dev versioning script for testing purposes"));
                         if (!lernaVersionCmd) {
                             utils_1.Logger.logError('Something went wrong while trying to detect which versioning script to run with Lerna.');
                             return [2 /*return*/, false];
                         }
-                        (0, child_process_1.execSync)("lerna version prepatch --preid dev ".concat(SHARED_LERNA_OPTIONS));
+                        (0, child_process_1.execSync)(lernaVersionCmd);
                         utils_1.Logger.logSuccess('Successfully executed Lerna versioning command.');
                         return [2 /*return*/, true];
                 }

package/lib/src/tasks/CommitPackageVersionsTask.js

@@ -93,6 +93,10 @@ var CommitPackageVersionsTask = /** @class */ (function () {
                 content = (0, fs_1.readFileSync)(filePath, { encoding: 'utf8' });
             }
             catch (_a) {
+                /**
+                 * If the file doesn't exist, ignore the error.
+                 * This will occur when TC Docker runs this script as it doesn't copy over @clickview/tooling
+                 */
                 continue;
             }
             commitFiles.push({

package/lib/src/tasks/CreateBranchTask.js

@@ -60,54 +60,36 @@ var CreateBranchTask = /** @class */ (function () {
     }
     CreateBranchTask.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var projects, _loop_1, this_1, _i, projects_1, project;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var projects, _i, projects_1, project, _a, branch, branchName, branchFrom;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         utils_1.Logger.logTask('Creating release branches');
                         return [4 /*yield*/, this.service.getProjects(options)];
                     case 1:
-                        projects = _a.sent();
-                        _loop_1 = function (project) {
-                            var _b, branch, branchName, branchFrom;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
-                                    case 0: return [4 /*yield*/, this_1.service.getNextBranchInfo(project.id, options.version)];
-                                    case 1:
-                                        _b = _c.sent(), branch = _b.branch, branchName = _b.branchName;
-                                        if (branch) {
-                                            utils_1.Logger.logWarning("[".concat(project.title, "]: [").concat(branchName, "] Already exists"));
-                                            return [2 /*return*/, "continue"];
-                                        }
-                                        branchFrom = (function () {
-                                            if (project.id.toString() === utils_1.ProjectIds.MONOREPO_PROJECT_ID)
-                                                return 'docker';
-                                            return options.version === 'patch' ? 'master' : 'dev';
-                                        })();
-                                        // const branchFrom = options.version === 'patch' ? 'master' : 'dev';
-                                        return [4 /*yield*/, this_1.service.createBranch(project, branchFrom, branchName, false)];
-                                    case 2:
-                                        // const branchFrom = options.version === 'patch' ? 'master' : 'dev';
-                                        _c.sent();
-                                        utils_1.Logger.logMessage("[".concat(project.title, "]: [").concat(branchName, "] Has been created"));
-                                        return [2 /*return*/];
-                                }
-                            });
-                        };
-                        this_1 = this;
+                        projects = _b.sent();
                         _i = 0, projects_1 = projects;
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2:
-                        if (!(_i < projects_1.length)) return [3 /*break*/, 5];
+                        if (!(_i < projects_1.length)) return [3 /*break*/, 6];
                         project = projects_1[_i];
-                        return [5 /*yield**/, _loop_1(project)];
+                        return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
                     case 3:
-                        _a.sent();
-                        _a.label = 4;
+                        _a = _b.sent(), branch = _a.branch, branchName = _a.branchName;
+                        if (branch) {
+                            utils_1.Logger.logWarning("[".concat(project.title, "]: [").concat(branchName, "] Already exists"));
+                            return [3 /*break*/, 5];
+                        }
+                        branchFrom = options.version === 'patch' ? 'master' : 'dev';
+                        return [4 /*yield*/, this.service.createBranch(project, branchFrom, branchName, false)];
                     case 4:
+                        _b.sent();
+                        utils_1.Logger.logMessage("[".concat(project.title, "]: [").concat(branchName, "] Has been created"));
+                        _b.label = 5;
+                    case 5:
                         _i++;
                         return [3 /*break*/, 2];
-                    case 5: return [2 /*return*/, true];
+                    case 6: return [2 /*return*/, true];
                 }
             });
         });