polyci 0.0.23 → 0.0.26

package/dist/main.js

@@ -120,7 +120,7 @@ function detectModuleType(directory) {
     catch (error) {
         log.warn({ directory, error }, "Unable to read package.json while detecting module type");
     }
-    return null;
+    return "npm-package";
 }
 function discoverModulesRecursively(repoRoot, modulesRoot, scanDir, modules) {
     const moduleType = detectModuleType(scanDir);
@@ -306,6 +306,7 @@ function appendGlobalReleaseJob(lines, modules, mainBranch, versionTemplate, bra
     for (const module of modules) {
         lines.push(`      - ${module.modulePath}/dist`);
         lines.push(`      - ${module.modulePath}/deploy.env`);
+        lines.push(`      - ${module.modulePath}/package.json`);
     }
     lines.push(`    expire_in: 1 day`);
     lines.push(``);
@@ -325,15 +326,14 @@ function appendModulePublishJob(lines, module) {
     lines.push(`    MODULE_PATH: ${module.modulePath}`);
     lines.push(`    MODULE_TYPE: ${module.moduleType}`);
     lines.push(`  script:`);
-    lines.push(`    - cp ci/$MODULE_TYPE/Dockerfile $MODULE_PATH`);
-    lines.push(`    - cd $MODULE_PATH`);
+    lines.push(`    - cp -r ci "${module.modulePath}/ci`);
+    lines.push(`    - cd ${module.modulePath}`);
     lines.push(`    - source deploy.env`);
-    lines.push(`    - echo -n $CI_JOB_TOKEN | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY`);
-    lines.push(`    - docker build --tag $CI_REGISTRY_IMAGE/$MODULE_NAME:v$INSTANCE_VERSION .`);
-    lines.push(`    - docker push $CI_REGISTRY_IMAGE/$MODULE_NAME:v$INSTANCE_VERSION`);
+    lines.push(`    - source "ci/${module.moduleType}/publish.sh"`);
     lines.push(`  artifacts:`);
     lines.push(`    paths:`);
-    lines.push(`      - $MODULE_PATH/deploy.env`);
+    lines.push(`      - ${module.modulePath}/deploy.env`);
+    lines.push(`      - ${module.modulePath}/package.json`);
     lines.push(`    expire_in: 1 day`);
     lines.push(``);
 }
@@ -351,25 +351,10 @@ function appendModuleDeployJob(lines, module) {
     lines.push(`    MODULE_PATH: ${module.modulePath}`);
     lines.push(`    MODULE_TYPE: ${module.moduleType}`);
     lines.push(`  script:`);
-    lines.push(`    - source $MODULE_PATH/deploy.env`);
-    lines.push(`    - export INSTANCE_HOST`);
-    lines.push(`    - export INSTANCE_CONTAINER `);
-    lines.push(`    - export INSTANCE_VERSION`);
-    lines.push(`    - apk add --update --no-cache openssh-client-default`);
-    lines.push(`    - eval $(ssh-agent -s)`);
-    lines.push(`    - echo "$DEPLOY_USER_KEY" | tr -d '\\r' | ssh-add -`);
-    lines.push(`    - mkdir -p ~/.ssh`);
-    lines.push(`    - chmod 700 ~/.ssh`);
-    lines.push(`    - ssh-keyscan -p $DEPLOY_PORT $DEPLOY_ADDRESS >> ~/.ssh/known_hosts`);
-    lines.push(`    - chmod 644 ~/.ssh/known_hosts`);
-    lines.push(`    - echo -n $CI_JOB_TOKEN | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY`);
-    lines.push(`    - docker context create remote --docker "host=ssh://$DEPLOY_USER@$DEPLOY_ADDRESS:$DEPLOY_PORT"`);
-    lines.push(`    - cd ci`);
-    lines.push(`    - export DOCKER_API_VERSION=1.41`);
-    lines.push(`    - docker --context remote compose -p $INSTANCE_CONTAINER down --remove-orphans`);
-    lines.push(`    - docker --context remote compose pull`);
-    lines.push(`    - docker --context remote compose -p $INSTANCE_CONTAINER up -d`);
-    lines.push(`    - rm -rf ~/.ssh`);
+    lines.push(`    - cp -r ci "${module.modulePath}/ci"`);
+    lines.push(`    - cd ${module.modulePath}`);
+    lines.push(`    - source deploy.env`);
+    lines.push(`    - source "ci/${module.moduleType}/deploy.sh"`);
     lines.push(``);
 }
 function buildPipeline(modules, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate, tagPattern) {

package/package.json

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