polyci 0.0.35 → 0.0.37

package/dist/main.js

@@ -7,7 +7,8 @@ const log = pino(pretty());
 const DEFAULT_TAG_TEMPLATE = "{module}-v{version}";
 const DEFAULT_VERSION_TEMPLATE = "{version}";
 const DEFAULT_BRANCH_VERSION_TEMPLATE = "{version}-{branch}-{increment}";
-const DEFAULT_TAG_PATTERN = "^$PLI_MODULE_NAME-v(?<version>\\d+(\\.\\d+)*)(-$CI_COMMIT_BRANCH-(?<increment>\\d+(\\.\\d+)*))?$";
+const DEFAULT_TAG_PATTERN = "^$PLI_MODULE_NAME-v(?<version>\\d+(\\.\\d+)*)$";
+const DEFAULT_BRANCH_TAG_PATTERN = "^$PLI_MODULE_NAME-v(?<version>\\d+(\\.\\d+)*)(-$CI_COMMIT_BRANCH-(?<increment>\\d+(\\.\\d+)*))?$";
 const ALLOWED_TAG_PLACEHOLDERS = new Set(["module", "version"]);
 const ALLOWED_VERSION_PLACEHOLDERS = new Set(["branch", "version", "increment"]);
 function applyVersionTemplate(template) {
@@ -53,7 +54,8 @@ function parseArgs() {
         .option("--version-template <template>", "Template for primary branch module version; placeholders {version}, {branch}, {increment}", DEFAULT_VERSION_TEMPLATE)
         .option("--branch-version-template <template>", "Template for non-primary branch module version; placeholders {version}, {branch}, {increment}", DEFAULT_BRANCH_VERSION_TEMPLATE)
         .option("--tag-template <template>", "Template for non-primary branch tags; use placeholders {module}, {version}", DEFAULT_TAG_TEMPLATE)
-        .option("--tag-pattern <pattern>", "Tag pattern passed to semalease to find the latest tag and calculate the next version/increment", DEFAULT_TAG_PATTERN)
+        .option("--tag-pattern <pattern>", "Tag pattern for main branch (passed to semalease)", DEFAULT_TAG_PATTERN)
+        .option("--branch-tag-pattern <pattern>", "Tag pattern for non-main branches (with ?<increment> for branch releases)", DEFAULT_BRANCH_TAG_PATTERN)
         .option("--cwd <path>", "Working directory", process.cwd())
         .parse();
     const options = program.opts();
@@ -65,6 +67,7 @@ function parseArgs() {
     const branchVersionTemplate = options.branchVersionTemplate;
     const tagTemplate = options.tagTemplate;
     const tagPattern = options.tagPattern;
+    const branchTagPattern = options.branchTagPattern;
     const invalidVersionTemplate = getInvalidVersionTemplatePlaceholders(versionTemplate);
     if (invalidVersionTemplate.length > 0) {
         program.error(`Invalid --version-template placeholders: ${invalidVersionTemplate
@@ -92,6 +95,7 @@ function parseArgs() {
         branchVersionTemplate,
         tagTemplate,
         tagPattern,
+        branchTagPattern,
     };
 }
 function toPosixPath(p) {
@@ -181,6 +185,7 @@ function appendModuleBuildJob(lines, module) {
     lines.push(`      - ${module.modulePath}/**/*`);
     lines.push(`  image: $IMAGE_NODE`);
     lines.push(`  script:`);
+    lines.push(`    - set -euo pipefail`);
     lines.push(`    - cp -r ci "${module.modulePath}/ci"`);
     lines.push(`    - cd ${module.modulePath}`);
     lines.push(`    - echo "PLI_MODULE_NAME=${module.moduleName}" > polyci.env`);
@@ -206,6 +211,7 @@ function appendModuleTestJob(lines, module) {
     lines.push(`    - job: ${module.moduleName}-build`);
     lines.push(`  image: $IMAGE_LINUX`);
     lines.push(`  script:`);
+    lines.push(`    - set -euo pipefail`);
     lines.push(`    - cp -r ci "${module.modulePath}/ci"`);
     lines.push(`    - cd ${module.modulePath}`);
     lines.push(`    - cat polyci.env`);
@@ -217,7 +223,7 @@ function appendModuleTestJob(lines, module) {
     lines.push(`      - ${module.modulePath}/polyci.env`);
     lines.push(``);
 }
-function appendModuleReleaseJob(lines, module, tagPattern, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate) {
+function appendModuleReleaseJob(lines, module, tagPattern, branchTagPattern, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate) {
     lines.push(`${module.moduleName}-release:`);
     lines.push(`  stage: release`);
     lines.push(`  rules:`);
@@ -228,11 +234,17 @@ function appendModuleReleaseJob(lines, module, tagPattern, mainBranch, versionTe
     lines.push(`    - job: ${module.moduleName}-test`);
     lines.push(`  image: $IMAGE_NODE`);
     lines.push(`  script:`);
+    lines.push(`    - set -euo pipefail`);
     lines.push(`    - apk update`);
     lines.push(`    - apk add $GIT_PACKAGE`);
     lines.push(`    - cat "${module.modulePath}/polyci.env"`);
     lines.push(`    - source "${module.modulePath}/polyci.env"`);
-    lines.push(`    - npx semalease --cwd "${module.modulePath}" --tag-pattern "${tagPattern}" ${module.modulePath}/semalease.env`);
+    lines.push(`    - |`);
+    lines.push(`      if [ "$CI_COMMIT_BRANCH" = "${mainBranch}" ]; then`);
+    lines.push(`        npx semalease --cwd "${module.modulePath}" --tag-pattern "${tagPattern}" ${module.modulePath}/semalease.env`);
+    lines.push(`      else`);
+    lines.push(`        npx semalease --cwd "${module.modulePath}" --tag-pattern "${branchTagPattern}" ${module.modulePath}/semalease.env`);
+    lines.push(`      fi`);
     lines.push(`    - |`);
     lines.push(`      if [ -f "${module.modulePath}/semalease.env" ]; then`);
     lines.push(`        source "${module.modulePath}/semalease.env"`);
@@ -241,19 +253,19 @@ function appendModuleReleaseJob(lines, module, tagPattern, mainBranch, versionTe
     lines.push(`            PLI_MODULE_VERSION="${applyVersionTemplate(versionTemplate)}"`);
     lines.push(`            PLI_MODULE_TAG="${applyTagTemplate(tagTemplate, module.moduleName)}"`);
     lines.push(`          else`);
-    lines.push(`            echo "Version did not change for ${module.moduleName} on branch $CI_COMMIT_BRANCH, skipping release."`);
+    lines.push(`            echo "No commits affecting ${module.moduleName} version on branch $CI_COMMIT_BRANCH."`);
     lines.push(`          fi`);
     lines.push(`        else`);
     lines.push(`          if [ "\${NEXT_VERSION:-}" != "\${LATEST_VERSION:-}" ] || [ "\${NEXT_INCREMENT:-}" != "\${LATEST_INCREMENT:-}" ]; then`);
     lines.push(`            PLI_MODULE_VERSION="${applyVersionTemplate(branchVersionTemplate)}"`);
     lines.push(`            PLI_MODULE_TAG="${applyTagTemplate(tagTemplate, module.moduleName)}"`);
     lines.push(`          else`);
-    lines.push(`            echo "Version/increment did not change for ${module.moduleName} on branch $CI_COMMIT_BRANCH, skipping release."`);
+    lines.push(`            echo "No commits affecting ${module.moduleName} version on branch $CI_COMMIT_BRANCH."`);
     lines.push(`          fi`);
     lines.push(`        fi`);
     lines.push(`      fi`);
     lines.push(`    - |`);
-    lines.push(`      if [ -n "$PLI_MODULE_VERSION" ] && [ -n "$PLI_MODULE_TAG" ]; then`);
+    lines.push(`      if [ -n "\${PLI_MODULE_VERSION:-}" ] && [ -n "\${PLI_MODULE_TAG:-}" ]; then`);
     lines.push(`        echo "PLI_MODULE_VERSION=$PLI_MODULE_VERSION" >> ${module.modulePath}/polyci.env`);
     lines.push(`        echo "PLI_MODULE_TAG=$PLI_MODULE_TAG" >> ${module.modulePath}/polyci.env`);
     lines.push(`      fi`);
@@ -274,9 +286,9 @@ function appendGlobalReleaseJob(lines, modules) {
     }
     lines.push(`  image: $IMAGE_NODE`);
     lines.push(`  script:`);
+    lines.push(`    - set -euo pipefail`);
     lines.push(`    - apk update`);
     lines.push(`    - apk add $GIT_PACKAGE`);
-    lines.push(`    - set -euo pipefail`);
     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:\${POLYCI_TOKEN}@\${CI_SERVER_HOST}/\${CI_PROJECT_PATH}.git"`);
@@ -289,7 +301,7 @@ function appendGlobalReleaseJob(lines, modules) {
         lines.push(`        unset PLI_MODULE_TAG`);
         lines.push(`        cat "${module.modulePath}/polyci.env"`);
         lines.push(`        source "${module.modulePath}/polyci.env"`);
-        lines.push(`        if [ -n "$PLI_MODULE_VERSION" ] && [ -n "$PLI_MODULE_TAG" ]; then`);
+        lines.push(`        if [ -n "\${PLI_MODULE_VERSION:-}" ] && [ -n "\${PLI_MODULE_TAG:-}" ]; then`);
         lines.push(`          cp -r ci "${module.modulePath}/ci"`);
         lines.push(`          ROOT_REPO_DIR="\${PWD}"`);
         lines.push(`          cd "${module.modulePath}"`);
@@ -331,8 +343,9 @@ function appendModulePublishJob(lines, module) {
     lines.push(`  needs:`);
     lines.push(`    - job: ${module.moduleName}-test`);
     lines.push(`    - job: release`);
-    lines.push(`  image: $IMAGE_DOCKER`);
+    lines.push(`  image: $IMAGE_NODE`);
     lines.push(`  script:`);
+    lines.push(`    - set -euo pipefail`);
     lines.push(`    - cp -r ci "${module.modulePath}/ci"`);
     lines.push(`    - cd ${module.modulePath}`);
     lines.push(`    - cat polyci.env`);
@@ -352,8 +365,9 @@ function appendModuleDeployJob(lines, module) {
     lines.push(`      - ${module.modulePath}/**/*`);
     lines.push(`  needs:`);
     lines.push(`    - job: ${module.moduleName}-publish`);
-    lines.push(`  image: $IMAGE_COMPOSE`);
+    lines.push(`  image: $IMAGE_NODE`);
     lines.push(`  script:`);
+    lines.push(`    - set -euo pipefail`);
     lines.push(`    - cp -r ci "${module.modulePath}/ci"`);
     lines.push(`    - cd ${module.modulePath}`);
     lines.push(`    - cat polyci.env`);
@@ -361,13 +375,13 @@ function appendModuleDeployJob(lines, module) {
     lines.push(`    - source "ci/${module.moduleType}/deploy.sh"`);
     lines.push(``);
 }
-function buildPipeline(modules, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate, tagPattern) {
+function buildPipeline(modules, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate, tagPattern, branchTagPattern) {
     const lines = [];
     appendGlobalVariables(lines);
     for (const module of modules) {
         appendModuleBuildJob(lines, module);
         appendModuleTestJob(lines, module);
-        appendModuleReleaseJob(lines, module, tagPattern, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate);
+        appendModuleReleaseJob(lines, module, tagPattern, branchTagPattern, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate);
     }
     appendGlobalReleaseJob(lines, modules);
     for (const module of modules) {
@@ -377,7 +391,7 @@ function buildPipeline(modules, mainBranch, versionTemplate, branchVersionTempla
     return `${lines.join("\n").trimEnd()}\n`;
 }
 function main() {
-    const { cwd, output, modulesRoot, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate, tagPattern } = parseArgs();
+    const { cwd, output, modulesRoot, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate, tagPattern, branchTagPattern } = parseArgs();
     if (!output) {
         log.error("Output path is required. Use [output] or --output <path>.");
         process.exit(1);
@@ -387,7 +401,7 @@ function main() {
         log.error({ cwd, modulesRoot }, "No supported modules were discovered under modules root");
         process.exit(1);
     }
-    const pipeline = buildPipeline(modules, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate, tagPattern);
+    const pipeline = buildPipeline(modules, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate, tagPattern, branchTagPattern);
     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.35",
+  "version": "0.0.37",
   "type": "module",
   "private": false,
   "author": "Alexander Tsarev",

package/readme.md

@@ -4,6 +4,7 @@ usage
 
 recommedations
 do not change the provided module types and scripts. instead, copy and customise your own type.
+be careful changin environment in release.sh (eg install packages) as the module releases run in one job in one container.
 
 requirements
 POLYCI_TOKEN variable must be defined in GitLab and accessible in the jobs that match the rule in the root .gitlab-ci.yml.