polyci 0.0.22 → 0.0.23

package/dist/main.js

@@ -97,13 +97,6 @@ function parseArgs() {
 function toPosixPath(p) {
     return p.split(path.sep).join("/");
 }
-function toJobId(value) {
-    return value
-        .replace(/[^a-zA-Z0-9_]/g, "_")
-        .replace(/_+/g, "_")
-        .replace(/^_+|_+$/g, "")
-        .toLowerCase();
-}
 function detectModuleType(directory) {
     const baseName = path.basename(directory);
     if (baseName === "node_modules" || baseName === ".git" || baseName === "dist") {
@@ -142,7 +135,6 @@ function discoverModulesRecursively(repoRoot, modulesRoot, scanDir, modules) {
             moduleName,
             modulePath: relativeModulePath,
             moduleType,
-            jobId: toJobId(relativeModulePath),
         });
         return;
     }
@@ -182,7 +174,7 @@ function appendGlobalVariables(lines) {
     lines.push(``);
 }
 function appendModuleBuildJob(lines, module) {
-    lines.push(`${module.jobId}_build:`);
+    lines.push(`${module.moduleName}-build:`);
     lines.push(`  stage: build`);
     lines.push(`  rules:`);
     lines.push(`    - changes:`);
@@ -203,13 +195,13 @@ function appendModuleBuildJob(lines, module) {
     lines.push(``);
 }
 function appendModuleTestJob(lines, module) {
-    lines.push(`${module.jobId}_test:`);
+    lines.push(`${module.moduleName}-test:`);
     lines.push(`  stage: test`);
     lines.push(`  rules:`);
     lines.push(`    - changes:`);
     lines.push(`      - ${module.modulePath}/**/*`);
     lines.push(`  needs:`);
-    lines.push(`    - job: ${module.jobId}_build`);
+    lines.push(`    - job: ${module.moduleName}-build`);
     lines.push(`  image: $IMAGE_LINUX`);
     lines.push(`  variables:`);
     lines.push(`    MODULE_NAME: ${module.moduleName}`);
@@ -221,14 +213,14 @@ function appendModuleTestJob(lines, module) {
     lines.push(``);
 }
 function appendModuleReleaseJob(lines, module, tagPattern) {
-    lines.push(`${module.jobId}_release:`);
+    lines.push(`${module.moduleName}-release:`);
     lines.push(`  stage: release`);
     lines.push(`  rules:`);
     lines.push(`    - changes:`);
     lines.push(`      - ${module.modulePath}/**/*`);
     lines.push(`  needs:`);
-    lines.push(`    - job: ${module.jobId}_build`);
-    lines.push(`    - job: ${module.jobId}_test`);
+    lines.push(`    - job: ${module.moduleName}-build`);
+    lines.push(`    - job: ${module.moduleName}-test`);
     lines.push(`  image: $IMAGE_NODE`);
     lines.push(`  variables:`);
     lines.push(`    MODULE_NAME: ${module.moduleName}`);
@@ -247,11 +239,11 @@ function appendModuleReleaseJob(lines, module, tagPattern) {
     lines.push(``);
 }
 function appendGlobalReleaseJob(lines, modules, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate) {
-    lines.push(`release_and_tag:`);
+    lines.push(`release:`);
     lines.push(`  stage: release`);
     lines.push(`  needs:`);
     for (const module of modules) {
-        lines.push(`    - job: ${module.jobId}_release`);
+        lines.push(`    - job: ${module.moduleName}-release`);
         lines.push(`      optional: true`);
     }
     lines.push(`  image: $IMAGE_NODE`);
@@ -267,7 +259,6 @@ function appendGlobalReleaseJob(lines, modules, mainBranch, versionTemplate, bra
     lines.push(`    - TAG_NAMES=""`);
     lines.push(``);
     for (const module of modules) {
-        lines.push(`    - echo "Tagging release for ${module.moduleName} (${module.modulePath})"`);
         lines.push(`    - |`);
         lines.push(`      if [ -f "${module.modulePath}/semalease.env" ]; then`);
         lines.push(`        . "${module.modulePath}/semalease.env"`);
@@ -291,7 +282,7 @@ function appendGlobalReleaseJob(lines, modules, mainBranch, versionTemplate, bra
         lines.push(`          cp -r ci "${module.modulePath}/ci"`);
         lines.push(`          cd "${module.modulePath}"`);
         lines.push(`          source "ci/${module.moduleType}/release.sh"`);
-        lines.push(`          cd - >/dev/null`);
+        lines.push(`          cd -`);
         lines.push(`          TAG_NAMES="\${TAG_NAMES} \${MODULE_TAG}"`);
         lines.push(`        fi`);
         lines.push(`      else`);
@@ -320,14 +311,14 @@ function appendGlobalReleaseJob(lines, modules, mainBranch, versionTemplate, bra
     lines.push(``);
 }
 function appendModulePublishJob(lines, module) {
-    lines.push(`${module.jobId}_publish:`);
+    lines.push(`${module.moduleName}-publish:`);
     lines.push(`  stage: publish`);
     lines.push(`  rules:`);
     lines.push(`    - changes:`);
     lines.push(`      - ${module.modulePath}/**/*`);
     lines.push(`  needs:`);
-    lines.push(`    - job: ${module.jobId}_test`);
-    lines.push(`    - job: release_and_tag`);
+    lines.push(`    - job: ${module.moduleName}-test`);
+    lines.push(`    - job: release`);
     lines.push(`  image: $IMAGE_DOCKER`);
     lines.push(`  variables:`);
     lines.push(`    MODULE_NAME: ${module.moduleName}`);
@@ -347,13 +338,13 @@ function appendModulePublishJob(lines, module) {
     lines.push(``);
 }
 function appendModuleDeployJob(lines, module) {
-    lines.push(`${module.jobId}_deploy:`);
+    lines.push(`${module.moduleName}-deploy:`);
     lines.push(`  stage: deploy`);
     lines.push(`  rules:`);
     lines.push(`    - changes:`);
     lines.push(`      - ${module.modulePath}/**/*`);
     lines.push(`  needs:`);
-    lines.push(`    - job: ${module.jobId}_publish`);
+    lines.push(`    - job: ${module.moduleName}-publish`);
     lines.push(`  image: $IMAGE_COMPOSE`);
     lines.push(`  variables:`);
     lines.push(`    MODULE_NAME: ${module.moduleName}`);

package/package.json

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