@nx/gradle 21.3.0-beta.2 → 21.3.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "21.3.0-beta.2",
+  "version": "21.3.0-beta.4",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -35,7 +35,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "21.3.0-beta.2"
+    "@nx/devkit": "21.3.0-beta.4"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/ci-workflow/files/circleci/.circleci/config.yml.template

@@ -21,13 +21,15 @@ jobs:
       # Run this command as early as possible, before dependencies are installed
       # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
       <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-jvm" --stop-agents-after="check"
+      # - run: ./nx start-ci-run --distribute-on="3 linux-medium-jvm" --stop-agents-after="check"
 
       - nx/set-shas:
           main-branch-name: '<%= mainBranch %>'
-<% for (const command of commands) { %>
-      <% if (command.command) { %>- run: <%= command.command %><% } else if (command.comments) { %><% for (const comment of command.comments) { %>
-      <%= comment %><% } %><% } else {%>- run: <%= command %><% } %><% } %>
+<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
+      # <%- comment %><% } %><% } %><% if (command.command) { %>
+      - run: 
+          command: <%= command.command %><% if (command.alwaysRun) { %>
+          when: always<% } %><% } %><% } %>
 
 workflows:
   version: 2

package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml.template

@@ -26,7 +26,7 @@ jobs:
       # Run this command as early as possible, before dependencies are installed
       # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
       <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-jvm" --stop-agents-after="check"
+      # - run: ./nx start-ci-run --distribute-on="3 linux-medium-jvm" --stop-agents-after="check"
 
       - name: Set up JDK 21 for x64
         uses: actions/setup-java@v4
@@ -39,6 +39,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - uses: nrwl/nx-set-shas@v4
-<% for (const command of commands) { %>
-      <% if (command.command) { %>- run: <%= command.command %><% } else if (command.comments) { %><% for (const comment of command.comments) { %>
-      <%= comment %><% } %><% } else {%>- run: <%= command %><% } %><% } %>
+<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
+      # <%- comment %><% } %><% } %><% if (command.command) { %>
+      - run: <%= command.command %><% if (command.alwaysRun) { %>
+        if: always()<% } %><% } %><% } %>

package/src/generators/ci-workflow/generator.d.ts

@@ -1,9 +1,9 @@
 import { Tree } from '@nx/devkit';
 export type Command = {
-    command: string;
-} | {
-    comments: string[];
-} | string;
+    command?: string;
+    comments?: string[];
+    alwaysRun?: boolean;
+};
 export interface Schema {
     name: string;
     ci: 'github' | 'circleci';

package/src/generators/ci-workflow/generator.js

@@ -11,13 +11,12 @@ function getCiCommands(ci) {
             return [
                 {
                     comments: [
-                        `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected.`,
-                        `# Change from check to check-ci if you turn on the atomizer. Learn more: https://nx.dev/nx-api/gradle#splitting-e2e-tests.`,
+                        `Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected.`,
+                        `Change from check to check-ci if you turn on the atomizer. Learn more: https://nx.dev/nx-api/gradle#splitting-e2e-tests.`,
                     ],
-                },
-                {
                     command: `./nx affected --base=$NX_BASE --head=$NX_HEAD -t assemble check`,
                 },
+                getNxCloudFixCiCommand(),
             ];
         }
         default: {
@@ -27,12 +26,22 @@ function getCiCommands(ci) {
                         `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected.`,
                         `# Change from check to check-ci if you turn on the atomizer. Learn more: https://nx.dev/nx-api/gradle#splitting-tests`,
                     ],
+                    command: `./nx affected -t assemble check`,
                 },
-                { command: `./nx affected -t assemble check` },
+                getNxCloudFixCiCommand(),
             ];
         }
     }
 }
+function getNxCloudFixCiCommand() {
+    return {
+        comments: [
+            `Nx Cloud recommends fixes for failures to help you get CI green faster. Learn more: https://nx.dev/ci/features/self-healing-ci`,
+        ],
+        command: `./nx fix-ci`,
+        alwaysRun: true,
+    };
+}
 async function ciWorkflowGenerator(tree, schema) {
     const ci = schema.ci;
     const options = getTemplateData(tree, schema);
@@ -41,8 +50,6 @@ async function ciWorkflowGenerator(tree, schema) {
 }
 function getTemplateData(tree, options) {
     const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name);
-    const packageManager = (0, devkit_1.detectPackageManager)();
-    const { exec: packageManagerPrefix } = (0, devkit_1.getPackageManagerCommand)(packageManager);
     let nxCloudHost = 'nx.app';
     try {
         const nxCloudUrl = (0, nx_cloud_utils_1.getNxCloudUrl)((0, devkit_1.readNxJson)(tree));
@@ -55,8 +62,6 @@ function getTemplateData(tree, options) {
     return {
         workflowName,
         workflowFileName,
-        packageManager,
-        packageManagerPrefix,
         commands,
         mainBranch,
         nxCloudHost,