@payfit/nx-core 5.6.9 → 5.6.10-ephemeral-fix-parallelization-config.0

package/dist/src/generators/init/globalFiles/.circleci/config.yml.template

@@ -111,7 +111,12 @@ jobs:
 <% if (parallelizeDockerBuilds > 0) { -%>
           command: |
             PROJECT_WITH_DOCKER=$(npx nx show projects --affected --base=$NX_BASE --head=$NX_HEAD --with-target=docker-build)
-            echo "$PROJECT_WITH_DOCKER" | circleci tests run --command="xargs -I '{}' bash -c 'npx nx run-many -t docker-build --parallel=3 -p {}'"
+            if [ -n "$PROJECT_WITH_DOCKER" ]; then
+              echo "$PROJECT_WITH_DOCKER" | circleci tests run --command="xargs -I '{}' bash -c 'npx nx run-many -t docker-build --parallel=3 -p {}'"
+            else
+              echo "No affected project, nothing to do"
+              circleci-agent step halt
+            fi
 <% } else { -%>
           command: npx nx affected -t docker-build
 <% } %>

package/dist/src/migrations/20251112-fix-parallelization-circleci.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function update(host: Tree): void;

package/dist/src/migrations/20251112-fix-parallelization-circleci.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const yaml_1 = require("yaml");
+const logger_1 = require("../utils/common/logger");
+function update(host) {
+    const circleciConfigPath = '.circleci/config.yml';
+    // Check if the CircleCI config file exists
+    if (!host.exists(circleciConfigPath)) {
+        logger_1.consola.warn(`${circleciConfigPath} not found. Skipping migration.`);
+        return;
+    }
+    // Read the CircleCI config file
+    const circleciConfig = host.read(circleciConfigPath, 'utf-8');
+    if (!circleciConfig) {
+        logger_1.consola.warn(`${circleciConfigPath} is empty. Skipping migration.`);
+        return;
+    }
+    // Parse the YAML document while preserving comments and anchors
+    const doc = (0, yaml_1.parseDocument)(circleciConfig);
+    // Navigate to jobs.docker-build
+    const jobs = doc.get('jobs');
+    if (!(0, yaml_1.isMap)(jobs)) {
+        logger_1.consola.warn('No jobs section found. Skipping migration.');
+        return;
+    }
+    const dockerBuildJob = jobs.get('docker-build');
+    if (!(0, yaml_1.isMap)(dockerBuildJob)) {
+        logger_1.consola.warn('No docker-build job found. Skipping migration.');
+        return;
+    }
+    // Check if the job has parallelism set (indicating it should use parallel builds)
+    const parallelism = dockerBuildJob.get('parallelism');
+    if (!parallelism) {
+        logger_1.consola.info('docker-build job does not have parallelism set. Skipping migration.');
+        return;
+    }
+    // Find the run step with the docker-build command
+    const steps = dockerBuildJob.get('steps');
+    if (!(0, yaml_1.isSeq)(steps)) {
+        logger_1.consola.warn('No steps found in docker-build job. Skipping migration.');
+        return;
+    }
+    let dockerBuildRunStep = null;
+    for (const step of steps.items) {
+        if ((0, yaml_1.isMap)(step) && step.has('run')) {
+            const runStep = step.get('run');
+            if ((0, yaml_1.isMap)(runStep)) {
+                const name = runStep.get('name');
+                if (name === 'docker-build') {
+                    dockerBuildRunStep = runStep;
+                    break;
+                }
+            }
+        }
+    }
+    if (!dockerBuildRunStep) {
+        logger_1.consola.warn('Could not find docker-build run step. Skipping migration.');
+        return;
+    }
+    const command = dockerBuildRunStep.get('command');
+    if (!command) {
+        logger_1.consola.warn('No command found in docker-build run step. Skipping migration.');
+        return;
+    }
+    // Check if the command is already fixed
+    const commandStr = command.toString();
+    if (commandStr.includes('if [ -n "$PROJECT_WITH_DOCKER" ]; then')) {
+        logger_1.consola.info('docker-build command already fixed. Skipping migration.');
+        return;
+    }
+    // Replace the old command with the new parallelization logic
+    const newCommand = `PROJECT_WITH_DOCKER=$(npx nx show projects --affected --base=$NX_BASE --head=$NX_HEAD --with-target=docker-build)
+if [ -n "$PROJECT_WITH_DOCKER" ]; then
+  echo "$PROJECT_WITH_DOCKER" | circleci tests run --command="xargs -I '{}' bash -c 'npx nx run-many -t docker-build --parallel=3 -p {}'"
+else
+  echo "No affected project, nothing to do"
+  circleci-agent step halt
+fi`;
+    dockerBuildRunStep.set('command', newCommand);
+    // Write back with comments and anchors preserved
+    host.write(circleciConfigPath, doc.toString({
+        lineWidth: 0, // avoid cutting line on width
+    }));
+    logger_1.consola.info('Successfully updated docker-build job to use parallelization logic in .circleci/config.yml');
+}
+//# sourceMappingURL=20251112-fix-parallelization-circleci.js.map

package/dist/src/migrations/20251112-fix-parallelization-circleci.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"20251112-fix-parallelization-circleci.js","sourceRoot":"","sources":["../../../src/migrations/20251112-fix-parallelization-circleci.ts"],"names":[],"mappings":"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"}

package/migrations.json

@@ -14,6 +14,11 @@
       "version": "5.2.0",
       "description": "Adds nx-conformance CI step as a requirement for the publish step",
       "implementation": "./dist/src/migrations/20251029-nx-conformance-requirement-publish"
+    },
+    "20251112-fix-parallelization-circleci": {
+      "version": "5.7.0",
+      "description": "Migration for v5.7.0",
+      "implementation": "./dist/src/migrations/20251112-fix-parallelization-circleci"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payfit/nx-core",
-  "version": "5.6.9",
+  "version": "5.6.10-ephemeral-fix-parallelization-config.0",
   "type": "commonjs",
   "main": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
@@ -17,6 +17,7 @@
     "@cdktf/hcl2json": "0.21.0",
     "@graphql-typed-document-node/core": "^3.2.0",
     "@inquirer/prompts": "^7.8.6",
+    "@nx/devkit": "22.0.1",
     "@octokit/auth-app": "^8.0.2",
     "@octokit/rest": "^22.0.0",
     "args-tokenizer": "^0.3.0",