Merge pull request #89 from topcoder-platform/dev

TCA-838 2.5 TCA Uni Nav & v1.0-Uni Nav -> master

Author: brooketopcoder

.circleci/config.yml

@@ -54,40 +54,9 @@ workspace_persist: &workspace_persist
 workspace_attach: &workspace_attach
     at: ./workspace
 
-# check_types: &check_types
-#     name: Check Types
-#     command: |
-#         npm ci
-#         npm run types
-#         diffstatus=$(git status --porcelain)
-#         echo DIFF=$diffstatus >> $GITHUB_OUTPUT
-
-running_version_patch: &running_version_patch
-    name: Patching Version
-    command: |
-        npm install
-        npm version patch -m "[ci skip]"
-        git push
-
-
 
 # DEFINE STEPS FOR JOBS
 
-# check_types_steps: &check_types_steps
-#     - checkout
-#     - setup_remote_docker
-#     - run: *check_types
-
-patch_version_steps: &patch_version_steps
-    # Initialization.
-    - checkout
-    - setup_remote_docker
-    - run: *install_build_dependency
-    - run: *install_deploysuite
-    # - run: *running_version_patch
-    - run: *running_npm_build
-    - persist_to_workspace: *workspace_persist 
-
 build_steps: &build_steps
     # Initialization.
     - checkout
@@ -113,10 +82,6 @@ deploy_steps: &deploy_steps
 
 jobs:
 
-    # increment-patch:
-    #     <<: *deploy_defaults
-    #     steps: *patch_version_steps
-    
     build-dev:
         <<: *defaults
         environment:
@@ -131,7 +96,7 @@ jobs:
             DEPLOY_ENV: "PROD"
             LOGICAL_ENV: "prod"
             APPNAME: "universal-navigation"
-        steps: *patch_version_steps
+        steps: *build_steps
 
     # Just tests commited code.
     deployDev:
@@ -152,28 +117,10 @@ jobs:
             APPNAME: "universal-navigation"
         steps: *deploy_steps
 
-    # checkTypes:
-    #     <<: *defaults
-    #     steps: *check_types_steps
-
-
 workflows:
     version: 2
     build:
         jobs:
-    #   - checkTypes:
-    #       context : org-global
-    #       filters: 
-    #         branches:
-    #           only:
-    #             - github-workflows
-
-            # - increment-patch:
-            #     context : org-global
-            #     filters:
-            #         branches:
-            #             only:
-            #                 - master
 
             - build-dev:
                 context : org-global
@@ -184,8 +131,6 @@ workflows:
 
             - build-prod:
                 context : org-global
-                # requires: 
-                #     - increment-patch
                 filters:
                     branches:
                         only:
@@ -195,14 +140,10 @@ workflows:
                 context : org-global
                 requires:
                     - build-dev
-                    # temporarily permit prod builds
-                    - build-prod
                 filters: 
                     branches:
                         only:
                             - dev
-                            # temporarily deploy master to dev
-                            - master
 
             - deployProd:
                 context : org-global