@nx/workspace 18.3.0-canary.20240403-270788e → 18.3.0-canary.20240405-fc8d5ba

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "18.3.0-canary.20240403-270788e",
+  "version": "18.3.0-canary.20240405-fc8d5ba",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -61,13 +61,13 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "18.3.0-canary.20240403-270788e",
+    "@nx/devkit": "18.3.0-canary.20240405-fc8d5ba",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "18.3.0-canary.20240403-270788e",
-    "@nrwl/workspace": "18.3.0-canary.20240403-270788e"
+    "nx": "18.3.0-canary.20240405-fc8d5ba",
+    "@nrwl/workspace": "18.3.0-canary.20240405-fc8d5ba"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__

@@ -49,6 +49,8 @@ jobs:
       - script: npm install --prefix=$HOME/.local -g pnpm@8
         displayName: Install PNPM
       <% } %>- script: <%= packageManagerInstall %>
+      - script: git branch --track main origin/main
+        condition: eq(variables['Build.Reason'], 'PullRequest')
 
       - script: <%= packageManagerPrefix %> nx-cloud record -- nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
       - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>

package/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__

@@ -28,6 +28,7 @@ pipelines:
       - step:
           name: 'Build and test affected apps on "<%= mainBranch %>" branch changes'
           script:
+            - export NX_BRANCH=$BITBUCKET_BRANCH
             # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
             # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
             # - <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"

package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__

@@ -22,6 +22,10 @@ jobs:
       - nx/set-shas:
           main-branch-name: '<%= mainBranch %>'
 
+      # Required for nx affected if we're on a branch
+      - run: git branch --track main origin/main
+        condition: eq(variables['Build.Reason'], 'PullRequest')
+
       - run: <%= packageManagerPrefix %> nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
       - run: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
 

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

@@ -34,5 +34,8 @@ jobs:
       - run: <%= packageManagerInstall %>
       - uses: nrwl/nx-set-shas@v4
 
+      - run: git branch --track main origin/main
+        if: ${{ github.event_name == 'pull_request' }}
+
       - run: <%= packageManagerPrefix %> nx-cloud record -- nx format:check
       - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>