@nx/gradle 21.0.0-rc.2 → 21.0.0-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "21.0.0-rc.2",
+  "version": "21.0.0-rc.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.0.0-rc.2"
+    "@nx/devkit": "21.0.0-rc.4"
   },
   "publishConfig": {
     "access": "public"

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

@@ -3,6 +3,9 @@ version: 2.1
 orbs:
   nx: nrwl/nx@1.6.2
 
+env:
+  NX_BATCH_MODE: true
+
 jobs:
   main:
     environment:
@@ -18,13 +21,13 @@ 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="build"
+      # - run: <%= packageManagerPrefix %> nx-cloud 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.comment) { %><%= command.comment %><% } else {%>- run: <%= command %><% } %><% } %>
+      <% if (command.command) { %>- run: <%= command.command %><% } else if (command.comments) { %><% for (const comment of command.comments) { %>
+      <%= comment %><% } %><% } else {%>- run: <%= command %><% } %><% } %>
 
 workflows:
   version: 2

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

@@ -10,6 +10,9 @@ permissions:
   actions: read
   contents: read
 
+env:
+  NX_BATCH_MODE: true
+
 jobs:
   main:
     runs-on: ubuntu-latest
@@ -23,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="build"
+      # - run: <%= packageManagerPrefix %> nx-cloud 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
@@ -33,9 +36,9 @@ jobs:
           architecture: x64
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v4
+        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.comment) { %><%= command.comment %><% } else {%>- run: <%= command %><% } %><% } %>
+      <% if (command.command) { %>- run: <%= command.command %><% } else if (command.comments) { %><% for (const comment of command.comments) { %>
+      <%= comment %><% } %><% } else {%>- run: <%= command %><% } %><% } %>

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

@@ -2,7 +2,7 @@ import { Tree } from '@nx/devkit';
 export type Command = {
     command: string;
 } | {
-    comment: string;
+    comments: string[];
 } | string;
 export interface Schema {
     name: string;

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

@@ -10,19 +10,25 @@ function getCiCommands(ci) {
         case 'circleci': {
             return [
                 {
-                    comment: `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected`,
+                    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.`,
+                    ],
                 },
                 {
-                    command: `./nx affected --base=$NX_BASE --head=$NX_HEAD -t build`,
+                    command: `./nx affected --base=$NX_BASE --head=$NX_HEAD -t assemble check`,
                 },
             ];
         }
         default: {
             return [
                 {
-                    comment: `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected`,
+                    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-tests`,
+                    ],
                 },
-                { command: `./nx affected -t build` },
+                { command: `./nx affected -t assemble check` },
             ];
         }
     }