Merge branch 'main' into feature/bq-icon_aria-label

Endava · Feb 28, 2024 · 88c1325 · 88c1325
2 parents d70ed51 + f8da1db
commit 88c1325
Show file tree

Hide file tree

Showing 17 changed files with 463 additions and 435 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -27,9 +27,8 @@ commands:
     description: Publish changes to Chromatic storybook
     steps:
       - run:
-          name: 📚 Publish to Chromatic
-          command: |
-            npx chromatic --project-token=${CHROMATIC_PROJECT_TOKEN} --ci --debug --no-file-hashing
+          name: 🚀 Publish to Chromatic
+          command: npx chromatic --project-token=${CHROMATIC_PROJECT_TOKEN} --ci --debug --no-file-hashing
 
 # ---------------------------------------------------------------------------- #
 #                         Jobs are collections of steps                        #
@@ -48,6 +47,9 @@ jobs:
     steps:
       # Checkout the code as the first step.
       - checkout
+      - run:
+          name: ▶️ Start Nx Cloud Agents
+          command: npx nx-cloud start-ci-run --distribute-on="3 linux-medium-js"
       - setup-node
       - restore_cache:
           name: 💫 Restore Cache dependencies
@@ -69,33 +71,26 @@ jobs:
           key: node-deps-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{checksum "package-lock.json"}}
           paths:
             - node_modules
-      - run:
-          name: 🗂️ Create `test-results` directory
-          # Use to store the test results
-          command: mkdir -p ./test-results
       - nx/set-shas
           # Derives SHAs for base and head for use in `nx affected` commands in CI
-      - run:
-          name: 🎨 Build BEEQ Tailwind CSS preset
-          command: npx nx run beeq-tailwindcss:build --base=$NX_BASE --head=$NX_HEAD --output-style=stream-without-prefixes
       - run:
           name: 🩺 Run Linters
-          command: |
-            npx nx affected -t lint --exclude='*,!tag:publishable' --output-style=stream-without-prefixes --base=$NX_BASE --head=$NX_HEAD -- --ci --code-coverage --runInBand
+          command: npx nx affected -t lint --exclude='*,!tag:publishable' --parallel=3 --output-style=stream-without-prefixes --base=$NX_BASE --head=$NX_HEAD --verbose
       - run:
           name: 🧰 Run Unit Tests
-          command: |
-            npx nx affected -t test --exclude='*,!tag:publishable' --output-style=stream-without-prefixes --base=$NX_BASE --head=$NX_HEAD -- --ci --code-coverage --runInBand
+          command: npx nx affected -t test --exclude='*,!tag:publishable' --parallel=1 --output-style=stream-without-prefixes --base=$NX_BASE --head=$NX_HEAD --verbose
       - run:
-          name: ⏳ Build
-          command: npm run build
+          name: ⏳ Build Libraries
+          command: npx nx affected -t build --exclude='*,!tag:publishable' --parallel=3 --output-style=stream-without-prefixes --base=$NX_BASE --head=$NX_HEAD --verbose
       - run:
           name: 🧪 Run E2E Tests
-          command: npx nx affected -t e2e --exclude='*,!tag:core' --output-style=stream-without-prefixes --base=$NX_BASE --head=$NX_HEAD -- --ci --code-coverage --runInBand
-      - store_test_results:
-          name: 📥 Store test results
-          # Special step used to upload and store test results for a build (when available)
-          path: test-results
+          command: npx nx affected -t e2e --exclude='*,!tag:core' --parallel=1 --output-style=stream-without-prefixes --base=$NX_BASE --head=$NX_HEAD --ci --code-coverage --runInBand --verbose
+      - run:
+          name: 📚 Build Storybook
+          command: npx nx affected -t storybook-build --parallel=1 --output-style=stream-without-prefixes --base=$NX_BASE --head=$NX_HEAD --verbose
+      - run:
+          name: ⏹️ Stop Nx Cloud Agents
+          command: npx nx-cloud stop-all-agents
       - chromatic-deployment
 
 # ---------------------------------------------------------------------------- #

diff --git a/nx.json b/nx.json
@@ -31,6 +31,7 @@
       "cache": true
     },
     "e2e": {
+      "dependsOn": [{ "target": "build", "projects": "beeq" }],
       "inputs": ["default", "^production"],
       "cache": true
     },