polyci 0.0.11 → 0.0.12

package/dist/main.js

@@ -141,7 +141,7 @@ function appendGlobalVariables(lines) {
     lines.push(`  IMAGE_DOCKER: docker:latest`);
     lines.push(`  IMAGE_COMPOSE: docker:cli`);
     lines.push(`  GIT_PACKAGE: git`);
-    lines.push(`  GIT_STRATEGY: clone`);
+    lines.push(`  GIT_STRATEGY: clone`); //this prevents the stale tags in the ci job.
     lines.push(``);
     lines.push(`stages:`);
     lines.push(`  - build`);
@@ -221,11 +221,11 @@ function appendModuleReleaseJob(lines, module) {
     lines.push(`      fi`);
     lines.push(`    - |`);
     lines.push(`      if [ "$MODULE_TYPE" = "node-express" ]; then`);
-    lines.push(`        node -e "const fs=require('fs'); const pkg=JSON.parse(fs.readFileSync('package.json','utf8')); pkg.version=process.env.PACKAGE_VERSION; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\\n');"`);
+    lines.push(`        node -e "const fs=require('fs'); const pkg=JSON.parse(fs.readFileSync('package.json','utf8')); pkg.version=process.argv[1]; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\\n');" "$PACKAGE_VERSION"`);
     lines.push(`        node ci/prepare-deploy-variables.js --instance-branch $CI_COMMIT_BRANCH`);
     lines.push(`      elif [ "$MODULE_TYPE" = "node-vite" ]; then`);
-    lines.push(`        node ci/set-release-data.js -i $CI_COMMIT_BRANCH --version=$NEXT_VERSION -t`);
-    lines.push(`        node -e "const fs=require('fs'); const pkg=JSON.parse(fs.readFileSync('package.json','utf8')); pkg.version=process.env.PACKAGE_VERSION; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\\n');"`);
+    lines.push(`        node ci/set-release-data.js -i $CI_COMMIT_BRANCH --version=$PACKAGE_VERSION -t`);
+    lines.push(`        node -e "const fs=require('fs'); const pkg=JSON.parse(fs.readFileSync('package.json','utf8')); pkg.version=process.argv[1]; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\\n');" "$PACKAGE_VERSION"`);
     lines.push(`        node ci/prepare-deploy-variables.js --instance-branch $CI_COMMIT_BRANCH`);
     lines.push(`      else`);
     lines.push(`        echo "Invalid module type: $MODULE_TYPE"`);
@@ -259,7 +259,7 @@ function appendGlobalReleaseJob(lines, modules, mainBranch, tagTemplate, branchT
     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(`    - TAG_NAMES=""`);
     lines.push(``);
     for (const module of modules) {
         lines.push(`    - echo "Tagging release for ${module.moduleName} (${module.modulePath})"`);
@@ -287,8 +287,7 @@ function appendGlobalReleaseJob(lines, modules, mainBranch, tagTemplate, branchT
         else if (module.moduleType === "node-vite") {
             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(`          TAG_NAMES="\${TAG_NAMES} \${TAG_NAME}"`);
         lines.push(`        fi`);
         lines.push(`      else`);
         lines.push(`        echo "Missing ${module.modulePath}/semalease.env, skipping ${module.moduleName}"`);
@@ -296,13 +295,12 @@ function appendGlobalReleaseJob(lines, modules, mainBranch, tagTemplate, branchT
     }
     lines.push(``);
     lines.push(`    - |`);
-    lines.push(`      if [ "$TAG_CREATED" = true ]; then`);
-    lines.push(`        git status`);
-    lines.push(`        git commit -m "release: ${modules.map((m) => m.moduleName).join(", ")}"`);
-    lines.push(`        git status`);
-    lines.push(`        TARGET_BRANCH="\${CI_COMMIT_BRANCH:-\${CI_COMMIT_REF_NAME}}"`);
-    lines.push(`        git push origin "HEAD:refs/heads/\${TARGET_BRANCH}"`);
-    lines.push(`        git push origin --tags`);
+    lines.push(`      if [ -n "$TAG_NAMES" ]; then`);
+    lines.push(`        git commit --allow-empty -m "release: ${modules.map((m) => m.moduleName).join(", ")}"`);
+    lines.push(`        for TAG_NAME in \${TAG_NAMES}; do`);
+    lines.push(`          git tag "\${TAG_NAME}"`);
+    lines.push(`        done`);
+    lines.push(`        git push origin "HEAD:refs/heads/\${TARGET_BRANCH}" && git push origin --tags"`);
     lines.push(`      else`);
     lines.push(`        echo "No new tags created; skipping commit/push"`);
     lines.push(`      fi`);
@@ -332,6 +330,7 @@ function appendModulePublishJob(lines, module) {
     lines.push(`  script:`);
     lines.push(`    - cp -r ci $MODULE_PATH/ci`);
     lines.push(`    - cd $MODULE_PATH`);
+    lines.push(`    - cat deploy.env`);
     lines.push(`    - source deploy.env`);
     lines.push(`    - npm ci`);
     lines.push(`    - cp ci/$MODULE_TYPE/Dockerfile .`);

package/package.json

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