polyci 0.0.5 → 0.0.7

package/dist/main.js

@@ -4,22 +4,65 @@ import * as path from "node:path";
 import pino from "pino";
 import pretty from "pino-pretty";
 const log = pino(pretty());
-const DEFAULT_BRANCH_RULE = "/^(main)|(develop)|(release(-[a-z0-9]+)*)|(feature(-[a-z0-9]+)*)|(patch(-[a-z0-9]+)*)$/";
+const DEFAULT_TAG_TEMPLATE = "{module}-v{version}";
+const DEFAULT_BRANCH_TAG_TEMPLATE = "{module}-v{version}-{branch}-{increment}";
+const ALLOWED_TAG_PLACEHOLDERS = new Set(["module", "branch", "version", "increment"]);
+function applyTagTemplate(template, moduleName) {
+    return template
+        .replaceAll("{module}", moduleName)
+        .replaceAll("{branch}", "${CI_COMMIT_BRANCH}")
+        .replaceAll("{version}", "${NEXT_VERSION}")
+        .replaceAll("{increment}", "${NEXT_INCREMENT}");
+}
+function getInvalidTagTemplatePlaceholders(template) {
+    const matches = template.matchAll(/\{([^}]+)\}/g);
+    const invalid = new Set();
+    for (const match of matches) {
+        const placeholder = match[1];
+        if (!ALLOWED_TAG_PLACEHOLDERS.has(placeholder)) {
+            invalid.add(placeholder);
+        }
+    }
+    return [...invalid];
+}
 function parseArgs() {
     const program = new Command();
     program
         .argument("[output]", "Output pipeline file path (or use --output)")
         .option("-o, --output <path>", "Output pipeline file path")
         .option("--modules-root <path>", "Modules root directory", "./modules")
-        .option("--branch-rule <regex>", "Branch rule regex for module jobs", DEFAULT_BRANCH_RULE)
+        .option("--main-branch <name>", "Primary branch name for release tagging logic", "main")
+        .option("--tag-template <template>", "Template for non-primary branch tags; use placeholders {module}, {branch}, {version}, {increment}", DEFAULT_TAG_TEMPLATE)
+        .option("--branch-tag-template <template>", "Template for non-primary branch tags; use placeholders {module}, {branch}, {version}, {increment}", DEFAULT_BRANCH_TAG_TEMPLATE)
         .option("--cwd <path>", "Working directory", process.cwd())
         .parse();
     const options = program.opts();
     const output = options.output ?? program.args[0] ?? "";
     const cwd = path.resolve(options.cwd);
     const modulesRoot = path.resolve(cwd, options.modulesRoot);
-    const branchRule = options.branchRule;
-    return { cwd, output, modulesRoot, branchRule };
+    const mainBranch = options.mainBranch;
+    const tagTemplate = options.tagTemplate;
+    const branchTagTemplate = options.branchTagTemplate;
+    const invalidPrimary = getInvalidTagTemplatePlaceholders(tagTemplate);
+    if (invalidPrimary.length > 0) {
+        program.error(`Invalid --tag-template placeholders: ${invalidPrimary
+            .map((x) => `{${x}}`)
+            .join(", ")}. Allowed: {module}, {branch}, {version}, {increment}.`);
+    }
+    const invalidSecondary = getInvalidTagTemplatePlaceholders(branchTagTemplate);
+    if (invalidSecondary.length > 0) {
+        program.error(`Invalid --branch-tag-template placeholders: ${invalidSecondary
+            .map((x) => `{${x}}`)
+            .join(", ")}. Allowed: {module}, {branch}, {version}, {increment}.`);
+    }
+    return {
+        cwd,
+        output,
+        modulesRoot,
+        mainBranch,
+        tagTemplate,
+        branchTagTemplate,
+    };
 }
 function toPosixPath(p) {
     return p.split(path.sep).join("/");
@@ -107,7 +150,7 @@ function appendGlobalVariables(lines) {
     lines.push("  - deploy");
     lines.push("");
 }
-function appendModuleBuildJob(lines, module, branchRule) {
+function appendModuleBuildJob(lines, module) {
     lines.push(`${module.jobId}_build:`);
     lines.push("  stage: build");
     lines.push("  rules:");
@@ -128,7 +171,7 @@ function appendModuleBuildJob(lines, module, branchRule) {
     lines.push("    expire_in: 1 day");
     lines.push("");
 }
-function appendModuleTestJob(lines, module, branchRule) {
+function appendModuleTestJob(lines, module) {
     lines.push(`${module.jobId}_test:`);
     lines.push("  stage: test");
     lines.push("  rules:");
@@ -146,7 +189,7 @@ function appendModuleTestJob(lines, module, branchRule) {
     lines.push('    - echo "test is tasty"');
     lines.push("");
 }
-function appendModuleReleaseJob(lines, module, branchRule) {
+function appendModuleReleaseJob(lines, module) {
     lines.push(`${module.jobId}_release:`);
     lines.push("  stage: release");
     lines.push("  rules:");
@@ -195,7 +238,7 @@ function appendModuleReleaseJob(lines, module, branchRule) {
     lines.push(`    expire_in: 1 day`);
     lines.push("");
 }
-function appendGlobalReleaseJob(lines, modules) {
+function appendGlobalReleaseJob(lines, modules, mainBranch, tagTemplate, branchTagTemplate) {
     lines.push("release_and_tag:");
     lines.push("  stage: release");
     lines.push("  needs:");
@@ -214,21 +257,22 @@ function appendGlobalReleaseJob(lines, modules) {
     lines.push("      git config user.email \"polyci@anarun.net\"");
     lines.push("      git config user.name \"polyci\"");
     lines.push("      git remote set-url origin \"https://oauth2:${GITLAB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git\"");
+    lines.push("      TAG_CREATED=false");
     lines.push("");
     for (const module of modules) {
         lines.push(`        echo "Tagging release for ${module.moduleName} (${module.modulePath})"`);
         lines.push(`        if [ -f "${module.modulePath}/semalease.env" ]; then`);
         lines.push(`          . "${module.modulePath}/semalease.env"`);
         lines.push("          TAG_NAME=\"\"");
-        lines.push("          if [ \"$CI_COMMIT_BRANCH\" = \"main\" ]; then");
+        lines.push(`          if [ "$CI_COMMIT_BRANCH" = "${mainBranch}" ]; then`);
         lines.push("            if [ \"${NEXT_VERSION:-}\" != \"${LATEST_VERSION:-}\" ]; then");
-        lines.push(`              TAG_NAME="${module.moduleName}-v\${NEXT_VERSION}"`);
+        lines.push(`              TAG_NAME="${applyTagTemplate(tagTemplate, module.moduleName)}"`);
         lines.push("            else");
         lines.push(`              echo "Version did not change for ${module.moduleName} on branch $CI_COMMIT_BRANCH, skipping tag"`);
         lines.push("            fi");
         lines.push("          else");
         lines.push("            if [ \"${NEXT_VERSION:-}\" != \"${LATEST_VERSION:-}\" ] || [ \"${NEXT_INCREMENT:-}\" != \"${LATEST_INCREMENT:-}\" ]; then");
-        lines.push(`              TAG_NAME="${module.moduleName}-v\${NEXT_VERSION}-\${CI_COMMIT_BRANCH}-\${NEXT_INCREMENT}"`);
+        lines.push(`              TAG_NAME="${applyTagTemplate(branchTagTemplate, module.moduleName)}"`);
         lines.push("            else");
         lines.push(`              echo "Version/increment did not change for ${module.moduleName} on branch $CI_COMMIT_BRANCH, skipping tag"`);
         lines.push("            fi");
@@ -241,15 +285,20 @@ function appendGlobalReleaseJob(lines, modules) {
             lines.push(`            git add "${module.modulePath}/package.json" "${module.modulePath}/public/release.json"`);
         }
         lines.push("            git tag \"$TAG_NAME\"");
+        lines.push("            TAG_CREATED=true");
         lines.push("          fi");
         lines.push("        else");
         lines.push(`          echo "Missing ${module.modulePath}/semalease.env, skipping ${module.moduleName}"`);
         lines.push("        fi");
     }
     lines.push("");
-    lines.push("      git commit -m \"release: update affected modules\"");
-    lines.push("      git push origin HEAD");
-    lines.push("      git push origin --tags");
+    lines.push("      if [ \"$TAG_CREATED\" = true ]; then");
+    lines.push("        git commit -m \"release: update affected modules\"");
+    lines.push("        git push origin HEAD");
+    lines.push("        git push origin --tags");
+    lines.push("      else");
+    lines.push("        echo \"No new tags created; skipping commit/push\"");
+    lines.push("      fi");
     lines.push(`  artifacts:`);
     lines.push(`    paths:`);
     for (const module of modules) {
@@ -259,7 +308,7 @@ function appendGlobalReleaseJob(lines, modules) {
     lines.push(`    expire_in: 1 day`);
     lines.push("");
 }
-function appendModulePublishJob(lines, module, branchRule) {
+function appendModulePublishJob(lines, module) {
     lines.push(`${module.jobId}_publish:`);
     lines.push("  stage: publish");
     lines.push("  rules:");
@@ -287,7 +336,7 @@ function appendModulePublishJob(lines, module, branchRule) {
     lines.push("    expire_in: 1 day");
     lines.push("");
 }
-function appendModuleDeployJob(lines, module, branchRule) {
+function appendModuleDeployJob(lines, module) {
     lines.push(`${module.jobId}_deploy:`);
     lines.push("  stage: deploy");
     lines.push("  rules:");
@@ -318,23 +367,23 @@ function appendModuleDeployJob(lines, module, branchRule) {
     lines.push("    - rm -rf ~/.ssh");
     lines.push("");
 }
-function buildPipeline(modules, branchRule) {
+function buildPipeline(modules, mainBranch, tagTemplate, branchTagTemplate) {
     const lines = [];
     appendGlobalVariables(lines);
     for (const module of modules) {
-        appendModuleBuildJob(lines, module, branchRule);
-        appendModuleTestJob(lines, module, branchRule);
-        appendModuleReleaseJob(lines, module, branchRule);
+        appendModuleBuildJob(lines, module);
+        appendModuleTestJob(lines, module);
+        appendModuleReleaseJob(lines, module);
     }
-    appendGlobalReleaseJob(lines, modules);
+    appendGlobalReleaseJob(lines, modules, mainBranch, tagTemplate, branchTagTemplate);
     for (const module of modules) {
-        appendModulePublishJob(lines, module, branchRule);
-        appendModuleDeployJob(lines, module, branchRule);
+        appendModulePublishJob(lines, module);
+        appendModuleDeployJob(lines, module);
     }
     return `${lines.join("\n").trimEnd()}\n`;
 }
 function main() {
-    const { cwd, output, modulesRoot, branchRule } = parseArgs();
+    const { cwd, output, modulesRoot, mainBranch, tagTemplate, branchTagTemplate, } = parseArgs();
     if (!output) {
         log.error("Output path is required. Use [output] or --output <path>.");
         process.exit(1);
@@ -344,7 +393,7 @@ function main() {
         log.error({ cwd, modulesRoot }, "No supported modules were discovered under modules root");
         process.exit(1);
     }
-    const pipeline = buildPipeline(modules, branchRule);
+    const pipeline = buildPipeline(modules, mainBranch, tagTemplate, branchTagTemplate);
     const outputPath = path.resolve(cwd, output);
     fs.writeFileSync(outputPath, pipeline, "utf8");
     log.info({ modules: modules.map((m) => m.modulePath), outputPath }, "Generated GitLab pipeline");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "polyci",
   "description": "Monorepo CI/CD utilities.",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "type": "module",
   "private": false,
   "author": "Alexander Tsarev",