From 2619bc3b0a7307c077e428ebf2221be385a67b27 Mon Sep 17 00:00:00 2001
From: Rodrigo Espinosa de los Monteros
 <1084688+RodEsp@users.noreply.github.com>
Date: Wed, 12 May 2021 12:34:17 -0400
Subject: [PATCH] fix: circleci config

---
 .circleci/config.yml | 84 +++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 52 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dc73ffa0..6cb8935b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,29 +1,42 @@
+---
 version: 2.1
 orbs:
   release-management: salesforce/npm-release-management@4
+
+parameters:
+  run-auto-workflows:
+    description: |
+      Boolean that controls when an workflow would run.
+      It is used to gate which workflows should run when github events occur.
+      This parameter is used by automation to determine if a workflow will run within a pipeline.
+    default: true
+    type: boolean
+  run-just-nuts:
+    description: |
+      Boolean that controls when the just-nuts will run.
+      Default value is false and this parameter is used by automation to determine if
+      the just-nuts workflow will run.
+    default: false
+    type: boolean
+  sfdx_version:
+    description: |
+      By default, the latest version of the standalone CLI will be installed.
+      To install via npm, supply a version tag such as "latest" or "6".
+    default: ''
+    type: string
+  repo_tag:
+    description: The tag of the module repo to checkout, '' defaults to branch/PR
+    default: ''
+    type: string
+
 workflows:
-  version: 2
   test-and-release:
+    when: << pipeline.parameters.run-auto-workflows >>
     jobs:
       - release-management/validate-pr:
           filters:
             branches:
               ignore: main
-        release-management/test-package:
-          matrix:
-            parameters:
-              os:
-                - linux
-                - windows
-              node_version:
-                - latest
-                - lts
-                - maintenance
-            exclude:
-              - os: windows
-                node_version: lts
-              - os: windows
-                node_version: maintenance
       - release-management/test-package:
           matrix:
             parameters:
@@ -47,7 +60,6 @@ workflows:
           filters:
             branches:
               only: main
-    when: << pipeline.parameters.run-auto-workflows >>
   test-ts-update:
     triggers:
       - schedule:
@@ -58,47 +70,15 @@ workflows:
                 - main
     jobs:
       - release-management/test-ts-update
+
   just-nuts:
     when: << pipeline.parameters.run-just-nuts >>
     jobs:
       - release-management/test-nut:
           name: just-nuts-<< matrix.os >>
           sfdx_version: << pipeline.parameters.sfdx_version >>
-          sfdx_executable_path: sfdx
+          sfdx_executable_path: 'sfdx'
           repo_tag: << pipeline.parameters.repo_tag >>
           matrix:
             parameters:
-              os:
-                - linux
-                - windows
-parameters:
-  run-auto-workflows:
-    description: >
-      Boolean that controls when an workflow would run.
-
-      It is used to gate which workflows should run when github events occur.
-
-      This parameter is used by automation to determine if a workflow will run
-      within a pipeline.
-    default: true
-    type: boolean
-  run-just-nuts:
-    description: >
-      Boolean that controls when the just-nuts will run.
-
-      Default value is false and this parameter is used by automation to
-      determine if
-
-      the just-nuts workflow will run.
-    default: false
-    type: boolean
-  sfdx_version:
-    description: |
-      By default, the latest version of the standalone CLI will be installed.
-      To install via npm, supply a version tag such as "latest" or "6".
-    default: ''
-    type: string
-  repo_tag:
-    description: 'The tag of the module repo to checkout, '''' defaults to branch/PR'
-    default: ''
-    type: string
+              os: [linux, windows]