polyci 0.0.5 → 0.0.6

package/dist/main.js

@@ -12,6 +12,7 @@ function parseArgs() {
         .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("--cwd <path>", "Working directory", process.cwd())
         .parse();
     const options = program.opts();
@@ -19,7 +20,8 @@ function parseArgs() {
     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;
+    return { cwd, output, modulesRoot, branchRule, mainBranch };
 }
 function toPosixPath(p) {
     return p.split(path.sep).join("/");
@@ -195,7 +197,7 @@ function appendModuleReleaseJob(lines, module, branchRule) {
     lines.push(`    expire_in: 1 day`);
     lines.push("");
 }
-function appendGlobalReleaseJob(lines, modules) {
+function appendGlobalReleaseJob(lines, modules, mainBranch) {
     lines.push("release_and_tag:");
     lines.push("  stage: release");
     lines.push("  needs:");
@@ -214,13 +216,14 @@ 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("            else");
@@ -241,15 +244,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) {
@@ -318,7 +326,7 @@ function appendModuleDeployJob(lines, module, branchRule) {
     lines.push("    - rm -rf ~/.ssh");
     lines.push("");
 }
-function buildPipeline(modules, branchRule) {
+function buildPipeline(modules, branchRule, mainBranch) {
     const lines = [];
     appendGlobalVariables(lines);
     for (const module of modules) {
@@ -326,7 +334,7 @@ function buildPipeline(modules, branchRule) {
         appendModuleTestJob(lines, module, branchRule);
         appendModuleReleaseJob(lines, module, branchRule);
     }
-    appendGlobalReleaseJob(lines, modules);
+    appendGlobalReleaseJob(lines, modules, mainBranch);
     for (const module of modules) {
         appendModulePublishJob(lines, module, branchRule);
         appendModuleDeployJob(lines, module, branchRule);
@@ -334,7 +342,7 @@ function buildPipeline(modules, branchRule) {
     return `${lines.join("\n").trimEnd()}\n`;
 }
 function main() {
-    const { cwd, output, modulesRoot, branchRule } = parseArgs();
+    const { cwd, output, modulesRoot, branchRule, mainBranch } = parseArgs();
     if (!output) {
         log.error("Output path is required. Use [output] or --output <path>.");
         process.exit(1);
@@ -344,7 +352,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, branchRule, mainBranch);
     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.6",
   "type": "module",
   "private": false,
   "author": "Alexander Tsarev",