circleci workspace adjustments

solarwinds · Nov 15, 2024 · 271280e · 271280e
1 parent a67b4e0
commit 271280e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 84 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,11 +1,22 @@
 version: 2.1
 orbs:
     browser-tools: circleci/[email protected]
+executors:
+  node:
+    docker:
+      - image: cimg/node:18.20
+    working_directory: ~/repo
+  node-browsers:
+    docker:
+      - image: cimg/node:18.20
+    working_directory: ~/repo
+  ubuntu:
+    working_directory: ~/nova
+    machine:
+      image: ubuntu-2204:2022.10.2
 jobs:
     install-deps:
-        working_directory: ~/nova
-        docker:
-          - image: cimg/node:18.20
+        executor: node
         environment:
           PROJECT_DIR: .
           BUILD_COUNTER: << pipeline.number >>
@@ -28,16 +39,14 @@ jobs:
                     yarn install --frozen-lockfile
                 fi
           - save_cache:
-              key: bits-deps-{{ checksum "yarn.lock" }}
+              key: deps-{{ checksum "yarn.lock" }}
               paths:
                 - ./node_modules
                 - ./packages/bits/node_modules
                 - ./packages/charts/node_modules
                 - ./packages/dashboards/node_modules
     bits-build:
-        working_directory: ~/nova
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         environment:
             PROJECT_DIR: ./packages/bits
             BUILD_COUNTER: << pipeline.number >>
@@ -54,7 +63,7 @@ jobs:
                       export gitCommit=`git log --pretty=format:'%H' -n 1 $PROJECT_DIR`
                       echo $gitCommit > $PROJECT_DIR/git-commit
             - restore_cache:
-                  key: bits-deps-{{ checksum "yarn.lock" }}
+                  key: deps-{{ checksum "yarn.lock" }}
             - restore_cache:
                   key: bits-dist-{{ checksum "packages/bits/git-commit" }}
             - run:
@@ -93,9 +102,7 @@ jobs:
                       - tsconfig.main.json
                       - yarn.lock
     bits-unit-test:
-        working_directory: ~/nova/packages/bits
-        docker:
-            - image: cimg/node:18.20-browsers
+        executor: node-browsers
         steps:
             - browser-tools/install-chrome
             - attach_workspace:
@@ -104,9 +111,7 @@ jobs:
                   name: Unit tests
                   command: yarn run test
     bits-e2e-test:
-        working_directory: ~/nova
-        machine:
-            image: ubuntu-2204:2022.10.2
+        executor: ubuntu
         environment:
             PROJECT_DIR: ~/nova/packages/bits
         steps:
@@ -132,9 +137,7 @@ jobs:
                   name: Cleanup
                   command: docker-compose down -v --rmi=local
     bits-a11y-test:
-        working_directory: ~/nova
-        machine:
-            image: ubuntu-2204:2022.10.2
+        executor: ubuntu
         environment:
             PROJECT_DIR: ~/nova/packages/bits
         steps:
@@ -152,9 +155,7 @@ jobs:
                   name: Cleanup
                   command: docker-compose down -v --rmi=local
     bits-visual-test:
-        working_directory: ~/nova
-        machine:
-            image: ubuntu-2204:2022.10.2
+        executor: ubuntu
         environment:
             PROJECT_DIR: ~/nova/packages/bits
         steps:
@@ -174,9 +175,7 @@ jobs:
                   name: Cleanup
                   command: docker-compose down -v --rmi=local
     bits-pack:
-        working_directory: ~/nova/packages/bits
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         steps:
             - attach_workspace:
                   at: ~/nova
@@ -188,9 +187,7 @@ jobs:
                   paths:
                       - ./packages/bits/*.tgz
     bits-publish:
-        working_directory: ~/nova
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         environment:
             PROJECT_DIR: ./packages/bits
         steps:
@@ -201,9 +198,7 @@ jobs:
                   command: |
                       yarn run publish-ci
     bits-verify:
-        working_directory: ~/nova
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         environment:
             PROJECT_DIR: ./packages/bits
         steps:
@@ -213,10 +208,9 @@ jobs:
                   name: Verify published package
                   command: |
                       yarn run verify-ci
+
     charts-build:
-        working_directory: ~/nova
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         environment:
             PROJECT_DIR: ./packages/charts
             BUILD_COUNTER: << pipeline.number >>
@@ -240,7 +234,7 @@ jobs:
                       cp package.json package.json~
                       yarn run --cwd=../.. remove-dependencies packages/charts
             - restore_cache:
-                  key: charts-deps-{{ checksum "yarn.lock" }}
+                  key: deps-{{ checksum "yarn.lock" }}
             - run:
                   working_directory: ~/nova/packages/charts
                   name: Install Bits
@@ -272,9 +266,7 @@ jobs:
                   paths:
                       - packages/charts
     charts-unit-test:
-        working_directory: ~/nova/packages/charts
-        docker:
-            - image: cimg/node:18.20-browsers
+        executor: node-browsers
         environment:
             # Needed for daylight saving time tests
             TZ: "America/Chicago"
@@ -286,9 +278,7 @@ jobs:
                   name: Unit tests
                   command: yarn run test
     charts-e2e-test:
-        working_directory: ~/nova
-        machine:
-            image: ubuntu-2204:2022.10.2
+        executor: ubuntu
         environment:
             PROJECT_DIR: ~/nova/packages/charts
         steps:
@@ -314,9 +304,7 @@ jobs:
                   name: Cleanup
                   command: docker-compose down -v --rmi=local
     charts-visual-test:
-        working_directory: ~/nova
-        machine:
-            image: ubuntu-2204:2022.10.2
+        executor: ubuntu
         environment:
             PROJECT_DIR: ~/nova/packages/charts
         steps:
@@ -336,9 +324,7 @@ jobs:
                   name: Cleanup
                   command: docker-compose down -v --rmi=local
     charts-pack:
-        working_directory: ~/nova/packages/charts
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         steps:
             - attach_workspace:
                   at: ~/nova
@@ -350,9 +336,7 @@ jobs:
                   paths:
                       - ./packages/charts/*.tgz
     charts-publish:
-        working_directory: ~/nova
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         environment:
             PROJECT_DIR: ./packages/charts
         steps:
@@ -363,9 +347,7 @@ jobs:
                   command: |
                       yarn run publish-ci
     charts-verify:
-        working_directory: ~/nova
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         environment:
             PROJECT_DIR: ./packages/charts
         steps:
@@ -375,10 +357,9 @@ jobs:
                   name: Verify published package
                   command: |
                       yarn run verify-ci
+
     dashboards-build:
-        working_directory: ~/nova
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         environment:
             PROJECT_DIR: ./packages/dashboards
             BUILD_COUNTER: << pipeline.number >>
@@ -403,7 +384,7 @@ jobs:
                       cp package.json package.json~
                       yarn run --cwd=../.. remove-dependencies packages/dashboards
             - restore_cache:
-                  key: dashboards-deps-{{ checksum "yarn.lock" }}
+                  key: deps-{{ checksum "yarn.lock" }}
             - run:
                   working_directory: ~/nova/packages/dashboards
                   name: Install bits
@@ -439,9 +420,7 @@ jobs:
                   paths:
                       - packages/dashboards
     dashboards-unit-test:
-        working_directory: ~/nova/packages/dashboards
-        docker:
-            - image: cimg/node:18.20-browsers
+        executor: node-browsers
         steps:
             - browser-tools/install-chrome
             - attach_workspace:
@@ -450,9 +429,7 @@ jobs:
                   name: Unit tests
                   command: yarn run test
     dashboards-e2e-test:
-        working_directory: ~/nova
-        machine:
-            image: ubuntu-2204:2022.10.2
+        executor: ubuntu
         environment:
             PROJECT_DIR: ~/nova/packages/dashboards
         steps:
@@ -478,9 +455,7 @@ jobs:
                   name: Cleanup
                   command: docker-compose down -v --rmi=local
     dashboards-visual-test:
-        working_directory: ~/nova
-        machine:
-            image: ubuntu-2204:2022.10.2
+        executor: ubuntu
         environment:
             PROJECT_DIR: ~/nova/packages/dashboards
         steps:
@@ -500,9 +475,7 @@ jobs:
                   name: Cleanup
                   command: docker-compose down -v --rmi=local
     dashboards-pack:
-        working_directory: ~/nova/packages/dashboards
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         steps:
             - attach_workspace:
                   at: ~/nova
@@ -514,9 +487,7 @@ jobs:
                   paths:
                       - ./packages/dashboards/*.tgz
     dashboards-publish:
-        working_directory: ~/nova
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         environment:
             PROJECT_DIR: ./packages/dashboards
         steps:
@@ -527,9 +498,7 @@ jobs:
                   command: |
                       yarn run publish-ci
     dashboards-verify:
-        working_directory: ~/nova
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         environment:
             PROJECT_DIR: ./packages/dashboards
         steps:
@@ -540,9 +509,7 @@ jobs:
                   command: |
                       yarn run verify-ci
     nova-docs:
-        working_directory: ~/nova
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         environment:
             NOVA_DIR: ~/nova
         steps:
@@ -562,9 +529,7 @@ jobs:
             - store_artifacts:
                   path: ./nova-docs.zip
     nova-docs-cleanup:
-        working_directory: ~/nova
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         environment:
             NOVA_DIR: ~/nova
         steps:
@@ -580,9 +545,7 @@ jobs:
                   name: Docs Cleanup
                   command: yarn run clean-docs-ci
     release-prep:
-        working_directory: ~/nova
-        docker:
-            - image: cimg/node:18.20
+        executor: node
         environment:
             SOURCE_BRANCH: main
             CREATE_RELEASE_BRANCH: "true"

diff --git a/packages/charts/package.json b/packages/charts/package.json
@@ -53,7 +53,7 @@
     "moment": "2.29.4"
   },
   "scripts": {
-    "assemble": "run-s prettier-check lint build-lib:locl build-lib:prod compodoc-custom-theme build-examples:prod",
+    "assemble": "run-s  build-lib:locl build-lib:prod compodoc-custom-theme build-examples:prod",
     "assemble-dev": "run-s build-lib:prod",
     "build-examples": "ng build examples",
     "build-examples:prod": "run-s \"build-examples -c production\"",
@@ -106,4 +106,4 @@
     "visual:serve": "yarn run visual:base -c serve"
   },
   "version": "16.0.0-0"
-}
+}