ci: update pipelines to run properly after move to nx (microsoft#32172)

GeoffCoxMSFT · Jul 31, 2024 · a1ce4d2 · a1ce4d2
1 parent 3da4204
commit a1ce4d2
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 4 deletions.
diff --git a/.devops/templates/build-test-lint.yml b/.devops/templates/build-test-lint.yml
@@ -44,7 +44,13 @@ steps:
       DANGER_GITHUB_API_TOKEN: $(DANGER_GITHUB_API_TOKEN)
 
   - script: |
-      yarn buildci $(sinceArg)
-    displayName: build, test, lint, test-ssr
+      yarn nx affected -t build test lint type-check test-ssr test-integration verify-packaging --nxBail $(sinceArg)
+    displayName: build, test, lint, test-ssr (affected)
+    condition: eq(variables.isPR, true)
+
+  - script: |
+      yarn nx run-many -t build test lint type-check test-ssr test-integration verify-packaging --nxBail
+    displayName: build, test, lint, test-ssr (all)
+    condition: eq(variables.isPR, false)
 
   - template: cleanup.yml
diff --git a/.devops/templates/deployE2E.yml b/.devops/templates/deployE2E.yml
@@ -18,18 +18,22 @@ steps:
   - script: |
       yarn nx affected -t bundle --nxBail $(sinceArg)
     displayName: bundle
+    condition: eq(variables.isPR, true)
 
   - script: |
       yarn nx affected -t build-storybook --nxBail $(sinceArg)
     displayName: build Storybooks
+    condition: eq(variables.isPR, true)
 
   ## This runs regardless of scope, the app will adapt to the scope as well
   - script: |
       yarn nx run pr-deploy-site:generate:site
     displayName: generate PR Deploy Site
+    condition: eq(variables.isPR, true)
 
   - task: AzureCLI@2
     displayName: Upload PR deploy site
+    condition: eq(variables.isPR, true)
     inputs:
       azureSubscription: $(azureSubscription)
       scriptType: 'bash'
@@ -45,6 +49,7 @@ steps:
 
   - task: GithubPRStatus@0
     displayName: 'Update PR deploy site github status'
+    condition: eq(variables.isPR, true)
     inputs:
       githubOwner: microsoft
       githubRepo: fluentui
@@ -57,5 +62,22 @@ steps:
   - script: |
       NX_PARALLEL=1 yarn nx affected -t e2e --nxBail --parallel 1 $(sinceArg)
     displayName: Cypress E2E tests
+    condition: eq(variables.isPR, true)
+
+  - script: |
+      yarn nx run-many -t bundle --nxBail
+    displayName: bundle
+    condition: eq(variables.isPR, false)
+
+  - script: |
+      yarn nx run-many -t build-storybook --nxBail
+    displayName: build Storybooks
+    condition: eq(variables.isPR, false)
+
+  # TODO: once https://github.com/nrwl/nx/issues/26903 will be fixed we can remove NX_PARALLEL=1 override via env variable
+  - script: |
+      NX_PARALLEL=1 yarn nx run-many -t e2e --nxBail --parallel 1
+    displayName: Cypress E2E tests
+    condition: eq(variables.isPR, false)
 
   - template: cleanup.yml
diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
@@ -5,7 +5,7 @@ trigger: none
 variables:
   - ${{ if not(startsWith(variables['Build.SourceBranch'], 'refs/heads/')) }}:
       - name: sinceArg
-        value: --since $(targetBranch)
+        value: --base $(targetBranch)
 
   - group: fabric-variables
 

diff --git a/azure-pipelines.bundlesize.yml b/azure-pipelines.bundlesize.yml
@@ -27,6 +27,7 @@ jobs:
       - script: |
           yarn nx affected -t bundle-size --nxBail $(sinceArg)
         displayName: build packages & create reports
+        condition: eq(variables.isPR, true)
 
       - script: |
           npx monosize compare-reports --branch=$(System.PullRequest.TargetBranch) --output=markdown --quiet > ./monosize-report.md
@@ -43,6 +44,11 @@ jobs:
           status: 'success'
           uniqueId: 'bundleSizeComment9423'
 
+      - script: |
+          yarn nx run-many -t bundle-size --nxBail
+        displayName: build all packages & create reports
+        condition: eq(variables.isPR, false)
+
       - script: |
           yarn monosize upload-report --branch=$(Build.SourceBranchName) --commit-sha $(Build.SourceVersion)
         displayName: upload a report (base only)

diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml
@@ -8,7 +8,7 @@ trigger: none
 variables:
   - ${{ if not(startsWith(variables['Build.SourceBranch'], 'refs/heads/')) }}:
       - name: sinceArg
-        value: --since $(targetBranch)
+        value: --base $(targetBranch)
 
   - template: .devops/templates/variables.yml