@payfit/nx-core 5.6.10-ephemeral-fix-parallelization-config.5 → 5.6.11

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

@@ -111,12 +111,7 @@ jobs:
 <% if (parallelizeDockerBuilds > 0) { -%>
           command: |
             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
+            echo "$PROJECT_WITH_DOCKER" | circleci tests run --command="xargs -I '{}' bash -c 'npx nx run-many -t docker-build --parallel=3 -p {}'"
 <% } else { -%>
           command: npx nx affected -t docker-build
 <% } %>

package/migrations.json

@@ -14,11 +14,6 @@
       "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": "Apply a fix to parallelized jobs so they do not run everything if no affected project",
-      "implementation": "./dist/src/migrations/20251112-fix-parallelization-circleci"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payfit/nx-core",
-  "version": "5.6.10-ephemeral-fix-parallelization-config.5",
+  "version": "5.6.11",
   "type": "commonjs",
   "main": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
@@ -17,7 +17,6 @@
     "@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",

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

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

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

@@ -1,98 +0,0 @@
-"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 section
-    const jobs = doc.get('jobs');
-    if (!(0, yaml_1.isMap)(jobs)) {
-        logger_1.consola.warn('No jobs section found. Skipping migration.');
-        return;
-    }
-    // Find all jobs that have parallelism set
-    const jobsWithParallelism = [];
-    if ((0, yaml_1.isMap)(jobs)) {
-        // Iterate over all job entries in the jobs map
-        for (const item of jobs.items) {
-            if (item.key instanceof yaml_1.Scalar) {
-                const jobName = item.key.value;
-                const job = item.value;
-                if ((0, yaml_1.isMap)(job) && job.has('parallelism')) {
-                    jobsWithParallelism.push({ jobName: jobName.toString(), job });
-                }
-            }
-        }
-    }
-    if (jobsWithParallelism.length === 0) {
-        logger_1.consola.info('No jobs with parallelism found. Skipping migration.');
-        return;
-    }
-    // Process each job with parallelism to find parallelizable commands
-    let updatedAnyJob = false;
-    for (const { jobName, job } of jobsWithParallelism) {
-        const steps = job.get('steps');
-        if (!(0, yaml_1.isSeq)(steps)) {
-            continue;
-        }
-        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 command = runStep.get('command');
-                    if (command && command.toString().includes('circleci tests run')) {
-                        const commandStr = command.toString();
-                        // Check if the command is already using the new parallelization logic
-                        if (commandStr.includes('No affected project, nothing to do')) {
-                            continue;
-                        }
-                        // Extract the target from the existing command
-                        const targetMatch = commandStr.match(/(?:-t|--target)\s+([^\s]+)/);
-                        if (!targetMatch)
-                            continue;
-                        const target = targetMatch[1];
-                        // Extract the parallel value from the existing command (only if it exists)
-                        const parallelMatch = commandStr.match(/--parallel[=:]?(\d+)/);
-                        const parallelParam = parallelMatch
-                            ? ` --parallel=${parallelMatch[1]}`
-                            : '';
-                        // Replace the old command with the new parallelization logic
-                        const newCommand = `PROJECTS=$(npx nx show projects --affected --base=$NX_BASE --head=$NX_HEAD --with-target=${target})
-if [ -n "$PROJECTS" ]; then
-  echo "$PROJECTS" | circleci tests run --command="xargs -I '{}' bash -c 'npx nx run-many -t ${target}${parallelParam} -p {}'"
-else
-  echo "No affected project, nothing to do"
-  circleci-agent step halt
-fi`;
-                        runStep.set('command', newCommand);
-                        updatedAnyJob = true;
-                    }
-                }
-            }
-        }
-    }
-    if (!updatedAnyJob) {
-        logger_1.consola.info('No job needed updating. Skipping migration.');
-        return;
-    }
-    // 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 jobs with parallelism to use skip if no affected project');
-}
-//# sourceMappingURL=20251112-fix-parallelization-circleci.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"20251112-fix-parallelization-circleci.js","sourceRoot":"","sources":["../../../src/migrations/20251112-fix-parallelization-circleci.ts"],"names":[],"mappings":";;AAKA,yBA6GC;AAjHD,+BAAmE;AAEnE,mDAAgD;AAEhD,SAAwB,MAAM,CAAC,IAAU;IACvC,MAAM,kBAAkB,GAAG,sBAAsB,CAAA;IAEjD,2CAA2C;IAC3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACrC,gBAAO,CAAC,IAAI,CAAC,GAAG,kBAAkB,iCAAiC,CAAC,CAAA;QACpE,OAAM;IACR,CAAC;IAED,gCAAgC;IAChC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAC7D,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,gBAAO,CAAC,IAAI,CAAC,GAAG,kBAAkB,gCAAgC,CAAC,CAAA;QACnE,OAAM;IACR,CAAC;IAED,gEAAgE;IAChE,MAAM,GAAG,GAAG,IAAA,oBAAa,EAAC,cAAc,CAAC,CAAA;IAEzC,2BAA2B;IAC3B,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5B,IAAI,CAAC,IAAA,YAAK,EAAC,IAAI,CAAC,EAAE,CAAC;QACjB,gBAAO,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAA;QAC1D,OAAM;IACR,CAAC;IAED,0CAA0C;IAC1C,MAAM,mBAAmB,GAA6C,EAAE,CAAA;IACxE,IAAI,IAAA,YAAK,EAAC,IAAI,CAAC,EAAE,CAAC;QAChB,+CAA+C;QAC/C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,GAAG,YAAY,aAAM,EAAE,CAAC;gBAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAA;gBAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAA;gBACtB,IAAI,IAAA,YAAK,EAAC,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;oBACzC,mBAAmB,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;gBAChE,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrC,gBAAO,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAA;QACnE,OAAM;IACR,CAAC;IAED,oEAAoE;IACpE,IAAI,aAAa,GAAG,KAAK,CAAA;IACzB,KAAK,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,mBAAmB,EAAE,CAAC;QACnD,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAC9B,IAAI,CAAC,IAAA,YAAK,EAAC,KAAK,CAAC,EAAE,CAAC;YAClB,SAAQ;QACV,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAC/B,IAAI,IAAA,YAAK,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAY,CAAA;gBAC1C,IAAI,IAAA,YAAK,EAAC,OAAO,CAAC,EAAE,CAAC;oBACnB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;oBACtC,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;wBACjE,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAA;wBACrC,sEAAsE;wBACtE,IAAI,UAAU,CAAC,QAAQ,CAAC,oCAAoC,CAAC,EAAE,CAAC;4BAC9D,SAAQ;wBACV,CAAC;wBAED,+CAA+C;wBAC/C,MAAM,WAAW,GAAG,UAAU,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;wBAClE,IAAI,CAAC,WAAW;4BAAE,SAAQ;wBAC1B,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;wBAE7B,2EAA2E;wBAC3E,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;wBAC9D,MAAM,aAAa,GAAG,aAAa;4BACjC,CAAC,CAAC,eAAe,aAAa,CAAC,CAAC,CAAC,EAAE;4BACnC,CAAC,CAAC,EAAE,CAAA;wBAEN,6DAA6D;wBAC7D,MAAM,UAAU,GAAG,4FAA4F,MAAM;;+FAElC,MAAM,GAAG,aAAa;;;;GAIlH,CAAA;wBAES,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;wBAClC,aAAa,GAAG,IAAI,CAAA;oBACtB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,gBAAO,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAA;QAC3D,OAAM;IACR,CAAC;IAED,iDAAiD;IACjD,IAAI,CAAC,KAAK,CACR,kBAAkB,EAClB,GAAG,CAAC,QAAQ,CAAC;QACX,SAAS,EAAE,CAAC,EAAE,8BAA8B;KAC7C,CAAC,CACH,CAAA;IACD,gBAAO,CAAC,IAAI,CACV,+EAA+E,CAChF,CAAA;AACH,CAAC"}